Commit b478cd8f authored by Gerson Fernando Budke's avatar Gerson Fernando Budke Committed by Daniel DeGrasse
Browse files

linker_script: Remove some remaining SUBALIGN in iterable sections



The #91219 miss some entries when doing the clean-up. This removes
some of remaining SUBALIGN entries in the iterable sections. It do
not consider SECTION_PROLOGUE and zephyr_linker_section entries.

Fixes #92349

Signed-off-by: default avatarGerson Fernando Budke <nandojve@gmail.com>
parent 9104e941
Loading
Loading
Loading
Loading
+1 −1
Original line number Original line Diff line number Diff line
@@ -118,7 +118,7 @@ if(CONFIG_SENSING)
endif()
endif()


if(CONFIG_ZBUS)
if(CONFIG_ZBUS)
  zephyr_iterable_section(NAME zbus_channel_observation_mask GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN 1)
  zephyr_iterable_section(NAME zbus_channel_observation_mask GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT})
endif()
endif()


if(CONFIG_UVB)
if(CONFIG_UVB)
+1 −1
Original line number Original line Diff line number Diff line
@@ -216,7 +216,7 @@ if (CONFIG_LOG)
endif()
endif()


if (CONFIG_MULTI_LEVEL_INTERRUPTS)
if (CONFIG_MULTI_LEVEL_INTERRUPTS)
  zephyr_iterable_section(NAME intc_table KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN 4)
  zephyr_iterable_section(NAME intc_table KVMA RAM_REGION GROUP RODATA_REGION)
endif()
endif()


if (CONFIG_HTTP_SERVER)
if (CONFIG_HTTP_SERVER)
+2 −4
Original line number Original line Diff line number Diff line
@@ -31,12 +31,10 @@ target_link_libraries(app PRIVATE zephyr_interface zephyr)
zephyr_linker_sources(SECTIONS sections-rom.ld)
zephyr_linker_sources(SECTIONS sections-rom.ld)
zephyr_linker_section_ifdef(CONFIG_NET_SAMPLE_HTTPS_SERVICE NAME
zephyr_linker_section_ifdef(CONFIG_NET_SAMPLE_HTTPS_SERVICE NAME
				http_resource_desc_test_https_service
				http_resource_desc_test_https_service
				KVMA RAM_REGION GROUP RODATA_REGION
				KVMA RAM_REGION GROUP RODATA_REGION)
				SUBALIGN Z_LINK_ITERABLE_SUBALIGN)
zephyr_linker_section_ifdef(CONFIG_NET_SAMPLE_HTTP_SERVICE NAME
zephyr_linker_section_ifdef(CONFIG_NET_SAMPLE_HTTP_SERVICE NAME
				http_resource_desc_test_http_service
				http_resource_desc_test_http_service
				KVMA RAM_REGION GROUP RODATA_REGION
				KVMA RAM_REGION GROUP RODATA_REGION)
				SUBALIGN Z_LINK_ITERABLE_SUBALIGN)


foreach(inc_file
foreach(inc_file
	ca.der
	ca.der
+2 −4
Original line number Original line Diff line number Diff line
@@ -59,10 +59,8 @@ endif()
if(CONFIG_NET_SAMPLE_HTTPS_SERVICE)
if(CONFIG_NET_SAMPLE_HTTPS_SERVICE)
  zephyr_linker_section_ifdef(CONFIG_NET_SAMPLE_WEBSOCKET_CONSOLE NAME
  zephyr_linker_section_ifdef(CONFIG_NET_SAMPLE_WEBSOCKET_CONSOLE NAME
			      http_resource_desc_wss_console_service
			      http_resource_desc_wss_console_service
			      KVMA RAM_REGION GROUP RODATA_REGION
			      KVMA RAM_REGION GROUP RODATA_REGION)
			      SUBALIGN Z_LINK_ITERABLE_SUBALIGN)
endif()
endif()
zephyr_linker_section_ifdef(CONFIG_NET_SAMPLE_WEBSOCKET_CONSOLE NAME
zephyr_linker_section_ifdef(CONFIG_NET_SAMPLE_WEBSOCKET_CONSOLE NAME
			    http_resource_desc_ws_console_service
			    http_resource_desc_ws_console_service
			    KVMA RAM_REGION GROUP RODATA_REGION
			    KVMA RAM_REGION GROUP RODATA_REGION)
			    SUBALIGN Z_LINK_ITERABLE_SUBALIGN)
+1 −2
Original line number Original line Diff line number Diff line
@@ -9,5 +9,4 @@ target_sources(app PRIVATE ${app_sources})


zephyr_linker_sources(SECTIONS sections-rom.ld)
zephyr_linker_sources(SECTIONS sections-rom.ld)
zephyr_iterable_section(NAME http_resource_desc_test_http_service KVMA
zephyr_iterable_section(NAME http_resource_desc_test_http_service KVMA
			RAM_REGION GROUP RODATA_REGION SUBALIGN $
			RAM_REGION GROUP RODATA_REGION)
			{CONFIG_LINKER_ITERABLE_SUBALIGN})