espressif: Fix build with RTC

tmedicci · xiaoxiang781216 · commit a763ed1e07cd · 2024-08-29T09:05:17.000+08:00
This commit ensures that RTC data is properly allocated in the RTC
segment in the linker. This fixes the reported problem about using
the legacy bootloader and RTC.
diff --git a/boards/risc-v/esp32c3-legacy/common/scripts/legacy_sections.ld b/boards/risc-v/esp32c3-legacy/common/scripts/legacy_sections.ld
@@ -245,7 +245,9 @@ SECTIONS
   .rtc.data :
   {
     *(.rtc.data)
+    *(.rtc.data.*)
     *(.rtc.rodata)
+    *(.rtc.rodata.*)
 
    /* Whatever is left from the RTC memory is used as a special heap. */
 
diff --git a/boards/risc-v/esp32c3-legacy/common/scripts/mcuboot_sections.ld b/boards/risc-v/esp32c3-legacy/common/scripts/mcuboot_sections.ld
@@ -294,7 +294,9 @@ SECTIONS
   .rtc.data :
   {
     *(.rtc.data)
+    *(.rtc.data.*)
     *(.rtc.rodata)
+    *(.rtc.rodata.*)
 
    /* Whatever is left from the RTC memory is used as a special heap. */
 
diff --git a/boards/risc-v/esp32c3/common/scripts/esp32c3_legacy_sections.ld b/boards/risc-v/esp32c3/common/scripts/esp32c3_legacy_sections.ld
@@ -265,7 +265,9 @@ SECTIONS
   .rtc.data :
   {
     *(.rtc.data)
+    *(.rtc.data.*)
     *(.rtc.rodata)
+    *(.rtc.rodata.*)
   } >rtc_iram_seg
 
   /* This section holds RTC data that should have fixed addresses.
diff --git a/boards/risc-v/esp32c6/common/scripts/esp32c6_legacy_sections.ld b/boards/risc-v/esp32c6/common/scripts/esp32c6_legacy_sections.ld
@@ -261,7 +261,9 @@ SECTIONS
   .rtc.data :
   {
     *(.rtc.data)
+    *(.rtc.data.*)
     *(.rtc.rodata)
+    *(.rtc.rodata.*)
   } >lp_ram_seg
 
   /* This section holds RTC data that should have fixed addresses.
diff --git a/boards/risc-v/esp32h2/common/scripts/esp32h2_legacy_sections.ld b/boards/risc-v/esp32h2/common/scripts/esp32h2_legacy_sections.ld
@@ -261,7 +261,9 @@ SECTIONS
   .rtc.data :
   {
     *(.rtc.data)
+    *(.rtc.data.*)
     *(.rtc.rodata)
+    *(.rtc.rodata.*)
   } >lp_ram_seg
 
   /* This section holds RTC data that should have fixed addresses.
diff --git a/boards/xtensa/esp32/common/scripts/legacy_sections.ld b/boards/xtensa/esp32/common/scripts/legacy_sections.ld
@@ -359,7 +359,9 @@ SECTIONS
   .rtc.data :
   {
     *(.rtc.data)
+    *(.rtc.data.*)
     *(.rtc.rodata)
+    *(.rtc.rodata.*)
 
    /* Whatever is left from the RTC memory is used as a special heap. */
 
diff --git a/boards/xtensa/esp32/common/scripts/mcuboot_sections.ld b/boards/xtensa/esp32/common/scripts/mcuboot_sections.ld
@@ -313,7 +313,9 @@ SECTIONS
   .rtc.data :
   {
     *(.rtc.data)
+    *(.rtc.data.*)
     *(.rtc.rodata)
+    *(.rtc.rodata.*)
 
    /* Whatever is left from the RTC memory is used as a special heap. */
 
diff --git a/boards/xtensa/esp32/common/scripts/simple_boot_sections.ld b/boards/xtensa/esp32/common/scripts/simple_boot_sections.ld
@@ -537,7 +537,9 @@ SECTIONS
   .rtc.data :
   {
     *(.rtc.data)
+    *(.rtc.data.*)
     *(.rtc.rodata)
+    *(.rtc.rodata.*)
 
    /* Whatever is left from the RTC memory is used as a special heap. */
 
diff --git a/boards/xtensa/esp32s2/common/scripts/mcuboot_sections.ld b/boards/xtensa/esp32s2/common/scripts/mcuboot_sections.ld
@@ -337,7 +337,9 @@ SECTIONS
   .rtc.data :
   {
     *(.rtc.data)
+    *(.rtc.data.*)
     *(.rtc.rodata)
+    *(.rtc.rodata.*)
 
    /* Whatever is left from the RTC memory is used as a special heap. */
 
diff --git a/boards/xtensa/esp32s2/common/scripts/simple_boot_sections.ld b/boards/xtensa/esp32s2/common/scripts/simple_boot_sections.ld
@@ -418,7 +418,9 @@ SECTIONS
   .rtc.data :
   {
     *(.rtc.data)
+    *(.rtc.data.*)
     *(.rtc.rodata)
+    *(.rtc.rodata.*)
 
    /* Whatever is left from the RTC memory is used as a special heap. */
 
diff --git a/boards/xtensa/esp32s3/common/scripts/legacy_sections.ld b/boards/xtensa/esp32s3/common/scripts/legacy_sections.ld
@@ -386,10 +386,20 @@ SECTIONS
     _iram_end = ABSOLUTE(.);
   } >iram0_0_seg
 
+  /* RTC BSS section. */
+
+  .rtc.bss (NOLOAD) :
+  {
+    *(.rtc.bss)
+  } >rtc_slow_seg
+
   .rtc.data :
   {
+    . = ALIGN(4);
     *(.rtc.data)
+    *(.rtc.data.*)
     *(.rtc.rodata)
+    *(.rtc.rodata.*)
 
    /* Whatever is left from the RTC memory is used as a special heap. */
 
diff --git a/boards/xtensa/esp32s3/common/scripts/mcuboot_sections.ld b/boards/xtensa/esp32s3/common/scripts/mcuboot_sections.ld
@@ -465,7 +465,9 @@ SECTIONS
   .rtc.data :
   {
     *(.rtc.data)
+    *(.rtc.data.*)
     *(.rtc.rodata)
+    *(.rtc.rodata.*)
 
    /* Whatever is left from the RTC memory is used as a special heap. */
 

Original file line number	Diff line number	Diff line change
`@@ -245,7 +245,9 @@ SECTIONS`
`245`	`245`	`.rtc.data :`
`246`	`246`	`{`
`247`	`247`	`*(.rtc.data)`
	`248`	`+ (.rtc.data.)`
`248`	`249`	`*(.rtc.rodata)`
	`250`	`+ (.rtc.rodata.)`
`249`	`251`
`250`	`252`	`/* Whatever is left from the RTC memory is used as a special heap. */`
`251`	`253`
Original file line number	Diff line number	Diff line change
`@@ -294,7 +294,9 @@ SECTIONS`
`294`	`294`	`.rtc.data :`
`295`	`295`	`{`
`296`	`296`	`*(.rtc.data)`
	`297`	`+ (.rtc.data.)`
`297`	`298`	`*(.rtc.rodata)`
	`299`	`+ (.rtc.rodata.)`
`298`	`300`
`299`	`301`	`/* Whatever is left from the RTC memory is used as a special heap. */`
`300`	`302`
Original file line number	Diff line number	Diff line change
`@@ -265,7 +265,9 @@ SECTIONS`
`265`	`265`	`.rtc.data :`
`266`	`266`	`{`
`267`	`267`	`*(.rtc.data)`
	`268`	`+ (.rtc.data.)`
`268`	`269`	`*(.rtc.rodata)`
	`270`	`+ (.rtc.rodata.)`
`269`	`271`	`} >rtc_iram_seg`
`270`	`272`
`271`	`273`	`/* This section holds RTC data that should have fixed addresses.`
Original file line number	Diff line number	Diff line change
`@@ -261,7 +261,9 @@ SECTIONS`
`261`	`261`	`.rtc.data :`
`262`	`262`	`{`
`263`	`263`	`*(.rtc.data)`
	`264`	`+ (.rtc.data.)`
`264`	`265`	`*(.rtc.rodata)`
	`266`	`+ (.rtc.rodata.)`
`265`	`267`	`} >lp_ram_seg`
`266`	`268`
`267`	`269`	`/* This section holds RTC data that should have fixed addresses.`
Original file line number	Diff line number	Diff line change
`@@ -359,7 +359,9 @@ SECTIONS`
`359`	`359`	`.rtc.data :`
`360`	`360`	`{`
`361`	`361`	`*(.rtc.data)`
	`362`	`+ (.rtc.data.)`
`362`	`363`	`*(.rtc.rodata)`
	`364`	`+ (.rtc.rodata.)`
`363`	`365`
`364`	`366`	`/* Whatever is left from the RTC memory is used as a special heap. */`
`365`	`367`
Original file line number	Diff line number	Diff line change
`@@ -313,7 +313,9 @@ SECTIONS`
`313`	`313`	`.rtc.data :`
`314`	`314`	`{`
`315`	`315`	`*(.rtc.data)`
	`316`	`+ (.rtc.data.)`
`316`	`317`	`*(.rtc.rodata)`
	`318`	`+ (.rtc.rodata.)`
`317`	`319`
`318`	`320`	`/* Whatever is left from the RTC memory is used as a special heap. */`
`319`	`321`
Original file line number	Diff line number	Diff line change
`@@ -537,7 +537,9 @@ SECTIONS`
`537`	`537`	`.rtc.data :`
`538`	`538`	`{`
`539`	`539`	`*(.rtc.data)`
	`540`	`+ (.rtc.data.)`
`540`	`541`	`*(.rtc.rodata)`
	`542`	`+ (.rtc.rodata.)`
`541`	`543`
`542`	`544`	`/* Whatever is left from the RTC memory is used as a special heap. */`
`543`	`545`
Original file line number	Diff line number	Diff line change
`@@ -337,7 +337,9 @@ SECTIONS`
`337`	`337`	`.rtc.data :`
`338`	`338`	`{`
`339`	`339`	`*(.rtc.data)`
	`340`	`+ (.rtc.data.)`
`340`	`341`	`*(.rtc.rodata)`
	`342`	`+ (.rtc.rodata.)`
`341`	`343`
`342`	`344`	`/* Whatever is left from the RTC memory is used as a special heap. */`
`343`	`345`
Original file line number	Diff line number	Diff line change
`@@ -418,7 +418,9 @@ SECTIONS`
`418`	`418`	`.rtc.data :`
`419`	`419`	`{`
`420`	`420`	`*(.rtc.data)`
	`421`	`+ (.rtc.data.)`
`421`	`422`	`*(.rtc.rodata)`
	`423`	`+ (.rtc.rodata.)`
`422`	`424`
`423`	`425`	`/* Whatever is left from the RTC memory is used as a special heap. */`
`424`	`426`