soc: esp32s2: linker script clean up

This PR removes common-rom.ld section so that logging sections
can now be mapped into RAM area.

Signed-off-by: Sylvio Alves <[email protected]>

Author: sylvioalves

soc/xtensa/esp32s2/Kconfig.defconfig

@@ -10,9 +10,6 @@ if BOOTLOADER_MCUBOOT
 config HAS_FLASH_LOAD_OFFSET
 	default y
 
-config XIP
-	default y
-
 config MCUBOOT_GENERATE_UNSIGNED_IMAGE
 	default y
 

soc/xtensa/esp32s2/Kconfig.soc

@@ -9,6 +9,7 @@ config SOC_ESP32S2
 	select CLOCK_CONTROL
 	select CLOCK_CONTROL_ESP32
 	select PINCTRL
+	select XIP
 
 if SOC_ESP32S2
 

soc/xtensa/esp32s2/linker.ld

@@ -134,66 +134,6 @@ SECTIONS
     *(.rodata_desc .rodata_desc.*)
     *(.rodata_custom_desc .rodata_custom_desc.*)
 
-#ifdef CONFIG_USERSPACE
-    Z_LINK_ITERABLE_ALIGNED(z_object_assignment, 4);
-#endif
-
-#if defined(CONFIG_NET_SOCKETS)
-    Z_LINK_ITERABLE_ALIGNED(net_socket_register, 4);
-#endif
-
-#if defined(CONFIG_NET_L2_PPP)
-    Z_LINK_ITERABLE_ALIGNED(ppp_protocol_handler, 4);
-#endif
-
-    Z_LINK_ITERABLE_ALIGNED(bt_l2cap_fixed_chan, 4);
-
-#if defined(CONFIG_BT_BREDR)
-    Z_LINK_ITERABLE_ALIGNED(bt_l2cap_br_fixed_chan, 4);
-#endif
-
-#if defined(CONFIG_BT_CONN)
-    Z_LINK_ITERABLE_ALIGNED(bt_conn_cb, 4)
-#endif
-
-    Z_LINK_ITERABLE_ALIGNED(bt_gatt_service_static, 4);
-
-#if defined(CONFIG_BT_MESH)
-    Z_LINK_ITERABLE_ALIGNED(bt_mesh_subnet_cb, 4);
-    Z_LINK_ITERABLE_ALIGNED(bt_mesh_app_key_cb, 4);
-    Z_LINK_ITERABLE_ALIGNED(bt_mesh_hb_cb, 4);
-#endif
-
-#if defined(CONFIG_BT_MESH_FRIEND)
-    Z_LINK_ITERABLE_ALIGNED(bt_mesh_friend_cb, 4);
-#endif
-
-#if defined(CONFIG_BT_MESH_LOW_POWER)
-    Z_LINK_ITERABLE_ALIGNED(bt_mesh_lpn_cb, 4);
-#endif
-
-#if defined(CONFIG_BT_MESH_PROXY)
-    Z_LINK_ITERABLE_ALIGNED(bt_mesh_proxy_cb, 4);
-#endif
-
-#if defined(CONFIG_EC_HOST_CMD)
-    Z_LINK_ITERABLE_ALIGNED(ec_host_cmd_handler, 4);
-#endif
-
-#if defined(CONFIG_SETTINGS)
-    Z_LINK_ITERABLE_ALIGNED(settings_handler_static, 4);
-#endif
-
-    Z_LINK_ITERABLE_ALIGNED(k_p4wq_initparam, 4);
-
-    Z_LINK_ITERABLE_ALIGNED(shell, 4);
-
-    Z_LINK_ITERABLE_ALIGNED(tracing_backend, 4)
-
-    __esp_shell_root_cmds_start = .;
-    KEEP(*(SORT(.shell_root_cmd_*)));
-    __esp_shell_root_cmds_end = .;
-
     . = ALIGN(4);
     #include <snippets-rodata.ld>
 
@@ -248,6 +188,19 @@ SECTIONS
     . = ALIGN(4);
   } GROUP_DATA_LINK_IN(RODATA_REGION, ROMABLE_REGION)
 
+  /* Flash segments (rodata and text) should be mapped in virtual address space by providing VMA.
+   * Executing directly from LMA is not possible. */
+  #pragma push_macro("GROUP_ROM_LINK_IN")
+  #undef GROUP_ROM_LINK_IN
+  #define GROUP_ROM_LINK_IN(vregion, lregion) > RODATA_REGION AT > lregion
+  #include "linker/common-rom/common-rom-kernel-devices.ld"
+  #include "linker/common-rom/common-rom-cpp.ld"
+  #include "linker/common-rom/common-rom-net.ld"
+  #include "linker/common-rom/common-rom-bt.ld"
+  #include "linker/common-rom/common-rom-debug.ld"
+  #include "linker/common-rom/common-rom-misc.ld"
+  #pragma pop_macro("GROUP_ROM_LINK_IN")
+
   /* Send .iram0 code to iram */
   .iram0.vectors : ALIGN(4)
   {
@@ -412,22 +365,16 @@ SECTIONS
     . = ALIGN(4);
   } GROUP_DATA_LINK_IN(RAMABLE_REGION, ROMABLE_REGION)
 
-  #pragma push_macro("GROUP_ROM_LINK_IN")
-  #pragma push_macro("ITERABLE_SECTION_ROM")
-  #undef GROUP_ROM_LINK_IN
-  #undef ITERABLE_SECTION_ROM
-  #define GROUP_ROM_LINK_IN GROUP_DATA_LINK_IN
-  #define ITERABLE_SECTION_ROM(x,y)
-  #include <linker/common-rom.ld>
-  #pragma pop_macro("GROUP_ROM_LINK_IN")
-  #pragma pop_macro("ITERABLE_SECTION_ROM")
-
   #include <snippets-data-sections.ld>
   #include <linker/common-ram.ld>
   #include <snippets-ram-sections.ld>
 
-  __shell_root_cmds_start = __esp_shell_root_cmds_start;
-  __shell_root_cmds_end = __esp_shell_root_cmds_end;
+  /* logging sections should be placed in RAM area to avoid flash cache disabled issues */
+  #pragma push_macro("GROUP_ROM_LINK_IN")
+  #undef GROUP_ROM_LINK_IN
+  #define GROUP_ROM_LINK_IN GROUP_DATA_LINK_IN
+  #include "linker/common-rom/common-rom-logging.ld"
+  #pragma pop_macro("GROUP_ROM_LINK_IN")
 
   .dummy.dram.data :
   {