Forráskód Böngészése

Merge branch 'bugfix/remove_rtc_dummy_sections' into 'master'

System: Memory section .rtc.dummy removed

Closes IDF-4395

See merge request espressif/esp-idf!17242
Mahavir Jain 4 éve
szülő
commit
46d5f92533
1 módosított fájl, 11 hozzáadás és 14 törlés
  1. 11 14
      components/esp_system/ld/esp32h2/sections.ld.in

+ 11 - 14
components/esp_system/ld/esp32h2/sections.ld.in

@@ -16,25 +16,20 @@ SECTIONS
   .rtc.text :
   {
     . = ALIGN(4);
+    _rtc_fast_start = ABSOLUTE(.);
 
     mapping[rtc_text]
 
     *rtc_wake_stub*.*(.literal .text .literal.* .text.*)
+    *(.rtc_text_end_test)
+
+    /* 16B padding for possible CPU prefetch and 4B alignment for PMS split lines */
+    . += _esp_memprot_prefetch_pad_size;
+    . = ALIGN(4);
+
     _rtc_text_end = ABSOLUTE(.);
   } > rtc_iram_seg
 
-  /**
-   * This section is required to skip rtc.text area because rtc_iram_seg and
-   * rtc_data_seg are reflect the same address space on different buses.
-   */
-  .rtc.dummy :
-  {
-    _rtc_dummy_start = ABSOLUTE(.);
-    _rtc_fast_start = ABSOLUTE(.);
-    . = SIZEOF(.rtc.text);
-    _rtc_dummy_end = ABSOLUTE(.);
-  } > rtc_data_seg
-
   /**
    * This section located in RTC FAST Memory area.
    * It holds data marked with RTC_FAST_ATTR attribute.
@@ -371,11 +366,13 @@ SECTIONS
   /* Marks the end of IRAM code segment */
   .iram0.text_end (NOLOAD) :
   {
+    /* iram_end_test section exists for use by memprot unit tests only */
+     *(.iram_end_test)
+
     /* ESP32-H2 memprot requires 16B padding for possible CPU prefetch and 512B alignment for PMS split lines */
     . += _esp_memprot_prefetch_pad_size;
     . = ALIGN(_esp_memprot_align_size);
-    /* iram_end_test section exists for use by memprot unit tests only */
-    *(.iram_end_test)
+
     _iram_text_end = ABSOLUTE(.);
   } > iram0_0_seg