Merge branch 'bugfix/fix_warning_in_freertos_port' into 'master'

wujiangang · wujiangang · commit 106ff9f5ef07 · 2018-05-31T17:35:46.000+08:00
fix(esp8266): Fix warning in port.c by using different section name

See merge request sdk/ESP8266_RTOS_SDK!206
diff --git a/components/esp8266/include/esp_attr.h b/components/esp8266/include/esp_attr.h
@@ -26,10 +26,10 @@
 #define ICACHE_RODATA_ATTR
 
 // Forces code into IRAM instead of flash.
-#define IRAM_ATTR __attribute__((section(".text")))
+#define IRAM_ATTR __attribute__((section(".iram1")))
 
 // Forces data into DRAM instead of flash
-#define DRAM_ATTR __attribute__((section(".data")))
+#define DRAM_ATTR __attribute__((section(".dram0")))
 
 // Forces data to be 4 bytes aligned
 #define WORD_ALIGNED_ATTR __attribute__((aligned(4)))
diff --git a/components/esp8266/ld/eagle.app.v6.common.ld b/components/esp8266/ld/eagle.app.v6.common.ld
@@ -93,6 +93,7 @@ SECTIONS
     *(.entry.text)
     *(.init.literal)
     *(.init)
+    *(.iram1 .iram1.*)
     *libcore.a:spi_flash.o(.literal .text .literal.* .text.*)
     *(.literal .text .stub .gnu.warning .gnu.linkonce.literal.* .gnu.linkonce.t.*.literal .gnu.linkonce.t.*)
     *(.fini.literal)
@@ -107,6 +108,7 @@ SECTIONS
     _data_start = ABSOLUTE(.);
     *(.data)
     *(.data.*)
+    *(.dram0)
     *(.gnu.linkonce.d.*)
     *(.data1)
     *(.sdata)
