can build and run hello-world app

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"
 

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;

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