components/esp32: fix DRAM_ATTR attribute

This change places contents of .dram1 section into .dram0.data.
Also removes .iram1pro/.iram1app/.dram1pro/.dram1app which weren't used anywhere.

diff --git a/components/esp32/include/esp_attr.h b/components/esp32/include/esp_attr.h
index c985e6b9fd3ebba83a87b0ecc008be780b4bf952..18a611489ba9c62fc849bee3c011fc4ce4c07a4f 100644 (file)
--- a/components/esp32/include/esp_attr.h
+++ b/components/esp32/include/esp_attr.h
@@ -20,16 +20,10 @@
 //and all variables in shared RAM. This can be redirected to IRAM if
 //needed using these macros.
 
-//Forces data and flash into IRAM instead of flash / shared RAM
+// Forces code into IRAM instead of flash
 #define IRAM_ATTR __attribute__((section(".iram1")))
-#define DRAM_ATTR __attribute__((section(".dram1")))
 
-//Forces data and flash into the IRAM section of a specific core.
-//Normally, you shouldn't have to use this: the linker will take care of
-//only linking in the functions for that specific core.
-#define IRAM_C0_ATTR __attribute__((section(".iram1pro")))
-#define DRAM_C0_ATTR __attribute__((section(".iram1pro")))
-#define IRAM_C1_ATTR __attribute__((section(".dram1app")))
-#define DRAM_C1_ATTR __attribute__((section(".dram1app")))
+// Forces data into DRAM instead of flash
+#define DRAM_ATTR __attribute__((section(".dram1")))
 
 #endif /* __ESP_ATTR_H__ */

diff --git a/components/esp32/ld/eagle.fpga32.v7.ld b/components/esp32/ld/eagle.fpga32.v7.ld
index 6824486a86530fd5dabc52502d5fa88f594c7d2f..ca79c52de7b05b51faf64ccaa01366bbd69c5c6a 100644 (file)
--- a/components/esp32/ld/eagle.fpga32.v7.ld
+++ b/components/esp32/ld/eagle.fpga32.v7.ld
@@ -106,6 +106,7 @@ SECTIONS
     KEEP(*(.sdata2.*))
     KEEP(*(.gnu.linkonce.s2.*))
     KEEP(*(.jcr))
+    *(.dram1 .dram1.*)
     _data_end = ABSOLUTE(.);
     . = ALIGN(4);
     _heap_start = ABSOLUTE(.);