(nuttx) 01/02: risc-v/esp32c3: linker script fix for mcuboot + wifi usage

[xiaoxiang]

This is an automated email from the ASF dual-hosted git repository.

xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git

commit 59a03d7ec310d6e9f5ebfd40ccdd5525cca49bec
Author: Filipe Cavalcanti <filipe.cavalca...@espressif.com>
AuthorDate: Wed Oct 23 14:49:22 2024 +0200

    risc-v/esp32c3: linker script fix for mcuboot + wifi usage
    
    Revert "risc-v/esp32c3: linker script fix for mcuboot + wifi usage"
    
    This reverts commit 3de5d2021b3a4c5fb506863f7b4763b57f038432.
    
    Testing no brownout detector
    
    Reenabled brownout
---
 .../esp32c3/common/scripts/esp32c3_sections.ld     | 23 ++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/boards/risc-v/esp32c3/common/scripts/esp32c3_sections.ld 
b/boards/risc-v/esp32c3/common/scripts/esp32c3_sections.ld
index e6f1e47e8b..ddc0612f37 100644
--- a/boards/risc-v/esp32c3/common/scripts/esp32c3_sections.ld
+++ b/boards/risc-v/esp32c3/common/scripts/esp32c3_sections.ld
@@ -141,11 +141,12 @@ SECTIONS
 
     *libhal.a:timer_hal.*(.literal.timer_hal_capture_and_get_counter_value 
.text.timer_hal_capture_and_get_counter_value)
 
-    *(.wifi0iram.*)
-    *(.wifirxiram.*)
-    *(.wifislpiram.*)
-    *(.wifiorslpiram.*)
-    *(.wifislprxiram.*)
+    *(.wifi0iram .wifi0iram.*)
+    *(.wifirxiram .wifirxiram.*)
+    *(.wifislpiram .wifislpiram.*)
+    *(.wifiorslpiram .wifiorslpiram.*)
+    *(.wifislprxiram .wifislprxiram.*)
+    *(.wifiextrairam .wifiextrairam.*)
 
   } >iram0_0_seg AT > ROM
 
@@ -163,9 +164,10 @@ SECTIONS
     /* This section contains data that is not initialized during load,
      * or during the application's initialization sequence.
      */
-
+    . = ALIGN(4);
     *(.noinit)
     *(.noinit.*)
+    . = ALIGN(4) ;
   } >dram0_0_seg
 
   .dram0.data :
@@ -250,9 +252,9 @@ SECTIONS
     esp_head.*(.rodata .rodata.*)
     esp_start.*(.rodata .rodata.*)
 
-    . = ALIGN(4);
     _edata = ABSOLUTE(.);
     _data_end = ABSOLUTE(.);
+    . = ALIGN(4);
   } >dram0_0_seg AT > ROM
 
   /* Shared RAM */
@@ -307,6 +309,8 @@ SECTIONS
     *(.fini)
     *(.gnu.version)
 
+    . += 16;
+
     _text_end = ABSOLUTE(.);
     _instruction_reserved_end = ABSOLUTE(.);  /* This is a symbol marking the 
flash.text end, this can be used for mmu driver to maintain virtual address */
     _etext = .;
@@ -455,7 +459,10 @@ SECTIONS
   {
     . = ALIGN(4);
     *(.rtc.literal .rtc.text)
-  } >rtc_iram_seg
+    *(.rtc.entry.text)
+    . += 16;
+    . = ALIGN(4);
+  } > rtc_iram_seg AT > ROM
 
   /* RTC BSS section. */