Skip to content

linker_script: Remove some remaining SUBALIGN in iterable sections #92350

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmake/linker_script/common/common-ram.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ if(CONFIG_SENSING)
endif()

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()

if(CONFIG_UVB)
Expand Down
2 changes: 1 addition & 1 deletion cmake/linker_script/common/common-rom.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ if (CONFIG_LOG)
endif()

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()

if (CONFIG_HTTP_SERVER)
Expand Down
6 changes: 2 additions & 4 deletions samples/net/prometheus/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,10 @@ target_link_libraries(app PRIVATE zephyr_interface zephyr)
zephyr_linker_sources(SECTIONS sections-rom.ld)
zephyr_linker_section_ifdef(CONFIG_NET_SAMPLE_HTTPS_SERVICE NAME
http_resource_desc_test_https_service
KVMA RAM_REGION GROUP RODATA_REGION
SUBALIGN Z_LINK_ITERABLE_SUBALIGN)
KVMA RAM_REGION GROUP RODATA_REGION)
zephyr_linker_section_ifdef(CONFIG_NET_SAMPLE_HTTP_SERVICE NAME
http_resource_desc_test_http_service
KVMA RAM_REGION GROUP RODATA_REGION
SUBALIGN Z_LINK_ITERABLE_SUBALIGN)
KVMA RAM_REGION GROUP RODATA_REGION)

foreach(inc_file
ca.der
Expand Down
6 changes: 2 additions & 4 deletions samples/net/sockets/echo_server/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,8 @@ endif()
if(CONFIG_NET_SAMPLE_HTTPS_SERVICE)
zephyr_linker_section_ifdef(CONFIG_NET_SAMPLE_WEBSOCKET_CONSOLE NAME
http_resource_desc_wss_console_service
KVMA RAM_REGION GROUP RODATA_REGION
SUBALIGN Z_LINK_ITERABLE_SUBALIGN)
KVMA RAM_REGION GROUP RODATA_REGION)
endif()
zephyr_linker_section_ifdef(CONFIG_NET_SAMPLE_WEBSOCKET_CONSOLE NAME
http_resource_desc_ws_console_service
KVMA RAM_REGION GROUP RODATA_REGION
SUBALIGN Z_LINK_ITERABLE_SUBALIGN)
KVMA RAM_REGION GROUP RODATA_REGION)
3 changes: 1 addition & 2 deletions tests/net/lib/http_client/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,4 @@ target_sources(app PRIVATE ${app_sources})

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