commit ad0bf94f772d28d12986bd17552575442147f9f7
author Sylvio Alves <sylvio.alves@espressif.com> Tue May 11 08:04:19 2021 -0300
committer Anas Nashif <anas.nashif@intel.com> Thu May 13 22:03:39 2021 -0400
tree f6a1693e6416be5e3c7610167df22e08e0cfb188
parent 6941c8fda9346225efc5f96cce19a2dd054ed78a

linker: esp32: fix empty iterable symbols

Z_ITERABLE_SECTION_ROM symbols were empty, meaning
that those symbols were not taking place in the linker script.

Signed-off-by: Sylvio Alves <sylvio.alves@espressif.com>

soc/xtensa/esp32/linker.ld

diff --git a/soc/xtensa/esp32/linker.ld b/soc/xtensa/esp32/linker.ld
index 74cb1ab..4f09b15 100644
--- a/soc/xtensa/esp32/linker.ld
+++ b/soc/xtensa/esp32/linker.ld
@@ -265,41 +265,6 @@
  SECTION_PROLOGUE(_RODATA_SECTION_NAME,,ALIGN(20))
   {
     _rodata_start = ABSOLUTE(.);
-#if defined(CONFIG_NET_SOCKETS)
-    . = ALIGN(4);
-    Z_LINK_ITERABLE(net_socket_register);
-    . = ALIGN(4);
-#endif
-
-#if defined(CONFIG_SETTINGS)
-    . = ALIGN(4);
-    Z_LINK_ITERABLE(settings_handler_static);
-    . = ALIGN(4);
-#endif
-
-#if defined(CONFIG_BT_BREDR)
-    . = ALIGN(4);
-    Z_LINK_ITERABLE(bt_l2cap_br_fixed_chan);
-    . = ALIGN(4);
-#endif
-
-#if defined(CONFIG_BT_MESH)
-    Z_LINK_ITERABLE(bt_mesh_subnet_cb);
-    Z_LINK_ITERABLE(bt_mesh_app_key_cb);
-    Z_LINK_ITERABLE(bt_mesh_hb_cb);
-#endif
-
-    . = ALIGN(4);
-    Z_LINK_ITERABLE(bt_gatt_service_static);
-    . = ALIGN(4);
-
-    . = ALIGN(4);
-    Z_LINK_ITERABLE(bt_l2cap_fixed_chan);
-    . = ALIGN(4);
-
-    . = ALIGN(4);
-    Z_LINK_ITERABLE(shell);
-    . = ALIGN(4);
 
     __esp_shell_root_cmds_start = .;
     KEEP(*(SORT(.shell_root_cmd_*)));
@@ -337,10 +302,7 @@
     _rodata_end = ABSOLUTE(.);
   } GROUP_LINK_IN(ROMABLE_REGION)
 
-#pragma push_macro("Z_ITERABLE_SECTION_ROM")
 #pragma push_macro("ROMABLE_REGION")
-#undef Z_ITERABLE_SECTION_ROM
-#define Z_ITERABLE_SECTION_ROM(x,y)
 #undef ROMABLE_REGION
 /* This is to workaround limitation of `esptool` which needs single `FLASH` data segment
  * which is already defined above. In case, `common-rom.ld` creates additional segments
@@ -355,7 +317,6 @@
 __shell_root_cmds_start = __esp_shell_root_cmds_start;
 __shell_root_cmds_end = __esp_shell_root_cmds_end;
 #pragma pop_macro("ROMABLE_REGION")
-#pragma pop_macro("Z_ITERABLE_SECTION_ROM")
 
   SECTION_PROLOGUE(_TEXT_SECTION_NAME, , ALIGN(4))
   {