Skip to content

Commit b478cd8

Browse files
nandojvedanieldegrasse
authored andcommitted
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: Gerson Fernando Budke <nandojve@gmail.com>
1 parent 9104e94 commit b478cd8

File tree

5 files changed

+7
-12
lines changed

5 files changed

+7
-12
lines changed

cmake/linker_script/common/common-ram.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ if(CONFIG_SENSING)
118118
endif()
119119

120120
if(CONFIG_ZBUS)
121-
zephyr_iterable_section(NAME zbus_channel_observation_mask GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT} SUBALIGN 1)
121+
zephyr_iterable_section(NAME zbus_channel_observation_mask GROUP DATA_REGION ${XIP_ALIGN_WITH_INPUT})
122122
endif()
123123

124124
if(CONFIG_UVB)

cmake/linker_script/common/common-rom.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ if (CONFIG_LOG)
216216
endif()
217217

218218
if (CONFIG_MULTI_LEVEL_INTERRUPTS)
219-
zephyr_iterable_section(NAME intc_table KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN 4)
219+
zephyr_iterable_section(NAME intc_table KVMA RAM_REGION GROUP RODATA_REGION)
220220
endif()
221221

222222
if (CONFIG_HTTP_SERVER)

samples/net/prometheus/CMakeLists.txt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,10 @@ target_link_libraries(app PRIVATE zephyr_interface zephyr)
3131
zephyr_linker_sources(SECTIONS sections-rom.ld)
3232
zephyr_linker_section_ifdef(CONFIG_NET_SAMPLE_HTTPS_SERVICE NAME
3333
http_resource_desc_test_https_service
34-
KVMA RAM_REGION GROUP RODATA_REGION
35-
SUBALIGN Z_LINK_ITERABLE_SUBALIGN)
34+
KVMA RAM_REGION GROUP RODATA_REGION)
3635
zephyr_linker_section_ifdef(CONFIG_NET_SAMPLE_HTTP_SERVICE NAME
3736
http_resource_desc_test_http_service
38-
KVMA RAM_REGION GROUP RODATA_REGION
39-
SUBALIGN Z_LINK_ITERABLE_SUBALIGN)
37+
KVMA RAM_REGION GROUP RODATA_REGION)
4038

4139
foreach(inc_file
4240
ca.der

samples/net/sockets/echo_server/CMakeLists.txt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,8 @@ endif()
5959
if(CONFIG_NET_SAMPLE_HTTPS_SERVICE)
6060
zephyr_linker_section_ifdef(CONFIG_NET_SAMPLE_WEBSOCKET_CONSOLE NAME
6161
http_resource_desc_wss_console_service
62-
KVMA RAM_REGION GROUP RODATA_REGION
63-
SUBALIGN Z_LINK_ITERABLE_SUBALIGN)
62+
KVMA RAM_REGION GROUP RODATA_REGION)
6463
endif()
6564
zephyr_linker_section_ifdef(CONFIG_NET_SAMPLE_WEBSOCKET_CONSOLE NAME
6665
http_resource_desc_ws_console_service
67-
KVMA RAM_REGION GROUP RODATA_REGION
68-
SUBALIGN Z_LINK_ITERABLE_SUBALIGN)
66+
KVMA RAM_REGION GROUP RODATA_REGION)

tests/net/lib/http_client/CMakeLists.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,4 @@ target_sources(app PRIVATE ${app_sources})
99

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

0 commit comments

Comments
 (0)