build system: fix rtc_data being placed in wrong region for S3

This commit is contained in:
Marius Vikhammer
2021-07-08 12:13:51 +08:00
parent 80acc1a002
commit 4553654f40
2 changed files with 2 additions and 5 deletions

View File

@@ -51,8 +51,6 @@ SECTIONS
* data/rodata, including from any source file * data/rodata, including from any source file
* named rtc_wake_stub*.c and the data marked with * named rtc_wake_stub*.c and the data marked with
* RTC_DATA_ATTR, RTC_RODATA_ATTR attributes. * RTC_DATA_ATTR, RTC_RODATA_ATTR attributes.
* The memory location of the data is dependent on
* CONFIG_ESP32C3_RTCDATA_IN_FAST_MEM option.
*/ */
.rtc.data : .rtc.data :
{ {
@@ -81,7 +79,6 @@ SECTIONS
* and will be retained during deep sleep. * and will be retained during deep sleep.
* User data marked with RTC_NOINIT_ATTR will be placed * User data marked with RTC_NOINIT_ATTR will be placed
* into this section. See the file "esp_attr.h" for more information. * into this section. See the file "esp_attr.h" for more information.
* The memory location of the data is dependent on CONFIG_ESP32C3_RTCDATA_IN_FAST_MEM option.
*/ */
.rtc_noinit (NOLOAD): .rtc_noinit (NOLOAD):
{ {

View File

@@ -101,9 +101,9 @@ _heap_end = 0x40000000;
_data_seg_org = ORIGIN(rtc_data_seg); _data_seg_org = ORIGIN(rtc_data_seg);
#if CONFIG_ESP32S3_RTCDATA_IN_FAST_MEM #if CONFIG_ESP32S3_RTCDATA_IN_FAST_MEM
REGION_ALIAS("rtc_data_location", rtc_slow_seg );
#else
REGION_ALIAS("rtc_data_location", rtc_data_seg ); REGION_ALIAS("rtc_data_location", rtc_data_seg );
#else
REGION_ALIAS("rtc_data_location", rtc_slow_seg );
#endif // CONFIG_ESP32S3_RTCDATA_IN_FAST_MEM #endif // CONFIG_ESP32S3_RTCDATA_IN_FAST_MEM
#if CONFIG_APP_BUILD_USE_FLASH_SECTIONS #if CONFIG_APP_BUILD_USE_FLASH_SECTIONS