From 4553654f400272c169cf562453892614c798a6ac Mon Sep 17 00:00:00 2001 From: Marius Vikhammer Date: Thu, 8 Jul 2021 12:13:51 +0800 Subject: [PATCH] build system: fix rtc_data being placed in wrong region for S3 --- components/esp32c3/ld/esp32c3.project.ld.in | 3 --- components/esp32s3/ld/esp32s3.ld | 4 ++-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/components/esp32c3/ld/esp32c3.project.ld.in b/components/esp32c3/ld/esp32c3.project.ld.in index 7c4c031a28..1aaa4ead6f 100644 --- a/components/esp32c3/ld/esp32c3.project.ld.in +++ b/components/esp32c3/ld/esp32c3.project.ld.in @@ -51,8 +51,6 @@ SECTIONS * data/rodata, including from any source file * named rtc_wake_stub*.c and the data marked with * 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 : { @@ -81,7 +79,6 @@ SECTIONS * and will be retained during deep sleep. * User data marked with RTC_NOINIT_ATTR will be placed * 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): { diff --git a/components/esp32s3/ld/esp32s3.ld b/components/esp32s3/ld/esp32s3.ld index e6c3c7bce2..82fb6a3e7b 100644 --- a/components/esp32s3/ld/esp32s3.ld +++ b/components/esp32s3/ld/esp32s3.ld @@ -101,9 +101,9 @@ _heap_end = 0x40000000; _data_seg_org = ORIGIN(rtc_data_seg); #if CONFIG_ESP32S3_RTCDATA_IN_FAST_MEM -REGION_ALIAS("rtc_data_location", rtc_slow_seg ); -#else REGION_ALIAS("rtc_data_location", rtc_data_seg ); +#else +REGION_ALIAS("rtc_data_location", rtc_slow_seg ); #endif // CONFIG_ESP32S3_RTCDATA_IN_FAST_MEM #if CONFIG_APP_BUILD_USE_FLASH_SECTIONS