Преглед на файлове

Merge branch 'bugfix/rename_ext_mem_bss_section' into 'master'

ld: rename .ext_ram.noinit to .ext_ram_noinit

See merge request espressif/esp-idf!14717
Marius Vikhammer преди 4 години
родител
ревизия
85b107bf54
променени са 2 файла, в които са добавени 3 реда и са изтрити 3 реда
  1. 1 1
      components/esp_common/include/esp_attr.h
  2. 2 2
      components/esp_system/ld/esp32/sections.ld.in

+ 1 - 1
components/esp_common/include/esp_attr.h

@@ -91,7 +91,7 @@ extern "C" {
 
 #if CONFIG_SPIRAM_ALLOW_NOINIT_SEG_EXTERNAL_MEMORY
 // Forces data into external memory noinit section to avoid initialization after restart.
-#define EXT_RAM_NOINIT_ATTR _SECTION_ATTR_IMPL(".ext_ram.noinit", __COUNTER__)
+#define EXT_RAM_NOINIT_ATTR _SECTION_ATTR_IMPL(".ext_ram_noinit", __COUNTER__)
 #else
 // Place in internal noinit section
 #define EXT_RAM_NOINIT_ATTR __NOINIT_ATTR

+ 2 - 2
components/esp_system/ld/esp32/sections.ld.in

@@ -201,10 +201,10 @@ SECTIONS
    * This section holds data that won't be initialised when startup.
    * This section locates in External RAM region.
    */
-  .ext_ram.noinit (NOLOAD) :
+  .ext_ram_noinit (NOLOAD) :
   {
     _ext_ram_noinit_start = ABSOLUTE(.);
-    *(.ext_ram.noinit*)
+    *(.ext_ram_noinit*)
     . = ALIGN(4);
     _ext_ram_noinit_end = ABSOLUTE(.);
   } > extern_ram_seg