From 82c27a39f241fd55304bbef28541f3158f4d38ac Mon Sep 17 00:00:00 2001
From: suda-morris <362953310@qq.com>
Date: Mon, 10 Jun 2019 12:08:08 +0800
Subject: [PATCH] can build and run hello-world app

---
 components/driver/gpio.c                 | 2 ++
 components/esp32s2beta/ld/esp32s2beta.ld | 2 ++
 components/soc/include/soc/can_periph.h  | 4 ----
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/components/driver/gpio.c b/components/driver/gpio.c
index e18c026bbd..bff943e43f 100644
--- a/components/driver/gpio.c
+++ b/components/driver/gpio.c
@@ -18,6 +18,8 @@
 #include "driver/gpio.h"
 #include "driver/rtc_io.h"
 #include "soc/soc.h"
+#include "soc/periph_defs.h"
+#include "soc/rtc_cntl_reg.h"
 #include "soc/gpio_periph.h"
 #include "esp_log.h"
 
diff --git a/components/esp32s2beta/ld/esp32s2beta.ld b/components/esp32s2beta/ld/esp32s2beta.ld
index 077d8d0cd5..c97b78b08b 100644
--- a/components/esp32s2beta/ld/esp32s2beta.ld
+++ b/components/esp32s2beta/ld/esp32s2beta.ld
@@ -70,5 +70,7 @@ MEMORY
                                      len = 0x1000 - CONFIG_ULP_COPROC_RESERVE_MEM
 }
 
+_static_data_end = _bss_end;
+
 /* Heap ends at top of dram0_0_seg */
 _heap_end = 0x40000000 - CONFIG_TRACEMEM_RESERVE_DRAM;
diff --git a/components/soc/include/soc/can_periph.h b/components/soc/include/soc/can_periph.h
index 6148c1ceed..c64519fc19 100644
--- a/components/soc/include/soc/can_periph.h
+++ b/components/soc/include/soc/can_periph.h
@@ -13,10 +13,6 @@
 // limitations under the License.
 
 #pragma once
-<<<<<<< a7ae5416fbc96f364c1047b2de9ba426677e258b
-#include "soc/can_struct.h"
-=======
 #if CONFIG_IDF_TARGET_ESP32
 #include "soc/can_struct.h"
 #endif
->>>>>>> build and link hello-world for esp32s2beta