linker: esp32: move snippets-section within rom boundary

This will guarantee that application snippets will be placed into ROM section properly. Signed-off-by: Sylvio Alves <[email protected]>
phan-uy-vu · Oct 13, 2023 · 4b5331b · 4b5331b
1 parent ac67f24
commit 4b5331b
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 10 deletions.
diff --git a/soc/riscv/espressif_esp32/esp32c3/default.ld b/soc/riscv/espressif_esp32/esp32c3/default.ld
@@ -197,6 +197,7 @@ SECTIONS
   #include <zephyr/linker/common-rom/common-rom-bt.ld>
   #include <zephyr/linker/common-rom/common-rom-debug.ld>
   #include <zephyr/linker/common-rom/common-rom-misc.ld>
+  #include <snippets-sections.ld>
 
   /* Create an explicit section at the end of all the data that shall be mapped into drom.
    * This is used to calculate the size of the _image_drom_size variable */
@@ -311,8 +312,6 @@ SECTIONS
     . = ALIGN(4);
   } GROUP_LINK_IN(RAMABLE_REGION)
 
-  #include <snippets-sections.ld>
-
   .dram0.data :
   {
     . = ALIGN(4);

diff --git a/soc/xtensa/espressif_esp32/esp32/default.ld b/soc/xtensa/espressif_esp32/esp32/default.ld
@@ -221,6 +221,7 @@ SECTIONS
   #include <zephyr/linker/common-rom/common-rom-bt.ld>
   #include <zephyr/linker/common-rom/common-rom-debug.ld>
   #include <zephyr/linker/common-rom/common-rom-misc.ld>
+  #include <snippets-sections.ld>
 
   /* Create an explicit section at the end of all the data that shall be mapped into drom.
    * This is used to calculate the size of the _image_drom_size variable */
@@ -234,8 +235,6 @@ SECTIONS
   _image_dram_size = LOADADDR(.dram0.end) + SIZEOF(.dram0.end) - _image_dram_start;
   _image_dram_vaddr = ADDR(.dram0.data);
 
-  #include <snippets-sections.ld>
-
   .dram0.data :
   {
     __data_start = ABSOLUTE(.);

diff --git a/soc/xtensa/espressif_esp32/esp32_net/linker.ld b/soc/xtensa/espressif_esp32/esp32_net/linker.ld
@@ -212,6 +212,7 @@ SECTIONS
   #include <zephyr/linker/common-rom/common-rom-bt.ld>
   #include <zephyr/linker/common-rom/common-rom-debug.ld>
   #include <zephyr/linker/common-rom/common-rom-misc.ld>
+  #include <snippets-sections.ld>
 
   /* Create an explicit section at the end of all the data that shall be mapped into drom.
    * This is used to calculate the size of the _image_drom_size variable */
@@ -225,8 +226,6 @@ SECTIONS
   _image_dram_size = LOADADDR(.dram0.end) + SIZEOF(.dram0.end) - _image_dram_start;
   _image_dram_vaddr = ADDR(.dram0.data);
 
-  #include <snippets-sections.ld>
-
   .dram0.data :
   {
     __data_start = ABSOLUTE(.);

diff --git a/soc/xtensa/espressif_esp32/esp32s2/default.ld b/soc/xtensa/espressif_esp32/esp32s2/default.ld
@@ -192,6 +192,7 @@ SECTIONS
   #include <zephyr/linker/common-rom/common-rom-net.ld>
   #include <zephyr/linker/common-rom/common-rom-debug.ld>
   #include <zephyr/linker/common-rom/common-rom-misc.ld>
+  #include <snippets-sections.ld>
 
   /* Create an explicit section at the end of all the data that shall be mapped into drom.
    * This is used to calculate the size of the _image_drom_size variable */
@@ -363,8 +364,6 @@ SECTIONS
     . = ALIGN(8);
   } GROUP_LINK_IN(RAMABLE_REGION)
 
-#include <snippets-sections.ld>
-
   .dram0.data :
   {
     . = ALIGN (8);

diff --git a/soc/xtensa/espressif_esp32/esp32s3/default.ld b/soc/xtensa/espressif_esp32/esp32s3/default.ld
@@ -229,6 +229,7 @@ SECTIONS
   #include <zephyr/linker/common-rom/common-rom-bt.ld>
   #include <zephyr/linker/common-rom/common-rom-debug.ld>
   #include <zephyr/linker/common-rom/common-rom-misc.ld>
+  #include <snippets-sections.ld>
 
   /* Create an explicit section at the end of all the data that shall be mapped into drom.
    * This is used to calculate the size of the _image_drom_size variable */
@@ -426,8 +427,6 @@ SECTIONS
     . = ALIGN(8) ;
   } GROUP_LINK_IN(RAMABLE_REGION)
 
-#include <snippets-sections.ld>
-
   .dram0.data :
   {
     . = ALIGN (8);