Crash_Override/OVMS3-idf
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

can build and run hello-world app

Browse source
This commit is contained in:
suda-morris 2019-06-10 12:08:08 +08:00
parent 73b30af2b3
commit 82c27a39f2
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
components/driver/gpio.c
View file

@ -18,6 +18,8 @@
#include "driver/gpio.h" #include "driver/gpio.h"
#include "driver/rtc_io.h" #include "driver/rtc_io.h"
#include "soc/soc.h" #include "soc/soc.h"
#include "soc/periph_defs.h"
#include "soc/rtc_cntl_reg.h"
#include "soc/gpio_periph.h" #include "soc/gpio_periph.h"
#include "esp_log.h" #include "esp_log.h"

2
components/esp32s2beta/ld/esp32s2beta.ld
View file

@ -70,5 +70,7 @@ MEMORY
len = 0x1000 - CONFIG_ULP_COPROC_RESERVE_MEM len = 0x1000 - CONFIG_ULP_COPROC_RESERVE_MEM
} }
_static_data_end = _bss_end;
/* Heap ends at top of dram0_0_seg */ /* Heap ends at top of dram0_0_seg */
_heap_end = 0x40000000 - CONFIG_TRACEMEM_RESERVE_DRAM; _heap_end = 0x40000000 - CONFIG_TRACEMEM_RESERVE_DRAM;

4
components/soc/include/soc/can_periph.h
View file

@ -13,10 +13,6 @@
// limitations under the License. // limitations under the License.
#pragma once #pragma once
<<<<<<< a7ae5416fbc96f364c1047b2de9ba426677e258b
#include "soc/can_struct.h"
=======
#if CONFIG_IDF_TARGET_ESP32 #if CONFIG_IDF_TARGET_ESP32
#include "soc/can_struct.h" #include "soc/can_struct.h"
#endif #endif
>>>>>>> build and link hello-world for esp32s2beta