You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by xi...@apache.org on 2021/06/18 05:53:50 UTC

[incubator-nuttx] 01/06: boards/risc-v/esp32c3-devkit/scripts: Drop the "iram" in the name of the RTC section.

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/incubator-nuttx.git

commit 61f7bc6e2a57a1cd159554aa6f33489abba67f18
Author: Abdelatif Guettouche <ab...@espressif.com>
AuthorDate: Mon Jun 14 10:17:42 2021 +0100

    boards/risc-v/esp32c3-devkit/scripts: Drop the "iram" in the name of the RTC
    section.
    
    The RTC region is accessed by both I and D buses.  The old name of
    `rtc_iram_seg` is a bit confusing.
    
    Signed-off-by: Abdelatif Guettouche <ab...@espressif.com>
---
 boards/risc-v/esp32c3/esp32c3-devkit/scripts/esp32c3.ld          | 6 +++---
 boards/risc-v/esp32c3/esp32c3-devkit/scripts/esp32c3.template.ld | 5 ++---
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/boards/risc-v/esp32c3/esp32c3-devkit/scripts/esp32c3.ld b/boards/risc-v/esp32c3/esp32c3-devkit/scripts/esp32c3.ld
index fa3b073..4640d22 100644
--- a/boards/risc-v/esp32c3/esp32c3-devkit/scripts/esp32c3.ld
+++ b/boards/risc-v/esp32c3/esp32c3-devkit/scripts/esp32c3.ld
@@ -223,7 +223,7 @@ SECTIONS
   {
     . = ALIGN(4);
     *(.rtc.literal .rtc.text)
-  } >rtc_iram_seg
+  } >rtc_seg
 
   /* This section is required to skip rtc.text area because the text and
    * data segments reflect the same address space on different buses.
@@ -232,7 +232,7 @@ SECTIONS
   .rtc.dummy :
   {
     . = SIZEOF(.rtc.text);
-  } >rtc_iram_seg
+  } >rtc_seg
 
   /* RTC data section holds RTC wake stub data/rodata. */
 
@@ -240,6 +240,6 @@ SECTIONS
   {
     *(.rtc.data)
     *(.rtc.rodata)
-  } >rtc_iram_seg
+  } >rtc_seg
 }
 
diff --git a/boards/risc-v/esp32c3/esp32c3-devkit/scripts/esp32c3.template.ld b/boards/risc-v/esp32c3/esp32c3-devkit/scripts/esp32c3.template.ld
index 4b8a5c3..9b34679 100644
--- a/boards/risc-v/esp32c3/esp32c3-devkit/scripts/esp32c3.template.ld
+++ b/boards/risc-v/esp32c3/esp32c3-devkit/scripts/esp32c3.template.ld
@@ -76,10 +76,9 @@ MEMORY
 
   drom0_0_seg (R) :       org = 0x3c000020, len = 0x8000000 - 0x20
 
-  /* RTC fast memory (executable). Persists over deep sleep. */
-
-  rtc_iram_seg(RWX) :     org = 0x50000000, len = 0x2000
+  /* RTC fast memory. Persists over deep sleep. */
 
+  rtc_seg(RWX) :          org = 0x50000000, len = 0x2000
 }
 
 #if CONFIG_ESP32C3_DEVKIT_RUN_IRAM