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

Merge branch 'bugfix/esp32s2_define_correct_size_for_rtc_fast_mem' into 'master'

Browse source 
esp32s2: Fix missed features CONFIG_BOOTLOADER_SKIP_VALIDATE_IN_DEEP_SLEEP and...

Closes IDF-1800

See merge request espressif/esp-idf!9031
This commit is contained in:
Angus Gratton 2020-06-10 16:04:41 +08:00
commit e29c9d331f
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
components/esp32s2/ld/esp32s2.ld
View file

@ -9,6 +9,13 @@
*/ */
#include "sdkconfig.h" #include "sdkconfig.h"
#ifdef CONFIG_BOOTLOADER_CUSTOM_RESERVE_RTC
#define ESP_BOOTLOADER_RESERVE_RTC (CONFIG_BOOTLOADER_RESERVE_RTC_SIZE + CONFIG_BOOTLOADER_CUSTOM_RESERVE_RTC_SIZE)
#elif defined(CONFIG_BOOTLOADER_SKIP_VALIDATE_IN_DEEP_SLEEP)
#define ESP_BOOTLOADER_RESERVE_RTC (CONFIG_BOOTLOADER_RESERVE_RTC_SIZE)
#else
#define ESP_BOOTLOADER_RESERVE_RTC 0
#endif
#ifdef CONFIG_ESP32S2_INSTRUCTION_CACHE_8KB #ifdef CONFIG_ESP32S2_INSTRUCTION_CACHE_8KB
#define CONFIG_ESP32S2_INSTRUCTION_CACHE_SIZE 0x2000 #define CONFIG_ESP32S2_INSTRUCTION_CACHE_SIZE 0x2000
@ -83,7 +90,7 @@ MEMORY
len = 0x2000 - CONFIG_ESP32S2_ULP_COPROC_RESERVE_MEM len = 0x2000 - CONFIG_ESP32S2_ULP_COPROC_RESERVE_MEM
/* RTC fast memory (same block as above), viewed from data bus */ /* RTC fast memory (same block as above), viewed from data bus */
rtc_data_seg(RW) : org = 0x3ff9e000, len = 0x2000 rtc_data_seg(RW) : org = 0x3ff9e000, len = 0x2000 - ESP_BOOTLOADER_RESERVE_RTC
} }
_static_data_end = _bss_end; _static_data_end = _bss_end;