Skip to content

Commit bd64f88

Browse files
RallareRallare
committed
linker_script: Remove SUBALIGN in iterable/linker sections
As per Zephyr upstream PR #91219, SUBALIGN functionality has been misunderstood throughout the upstream project. Aligning our downstream accordingly. Signed-off-by: Håkon Alseth <[email protected]>
1 parent 02d4cdc commit bd64f88

File tree

6 files changed

+12
-12
lines changed

6 files changed

+12
-12
lines changed

‎subsys/app_event_manager/CMakeLists.txt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ zephyr_sources(app_event_manager.c)
99
zephyr_sources_ifdef(CONFIG_APP_EVENT_MANAGER_SHELL app_event_manager_shell.c)
1010

1111
zephyr_linker_sources(SECTIONS aem.ld)
12-
zephyr_iterable_section(NAME event_type KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN 4)
13-
zephyr_iterable_section(NAME event_listener KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN 4)
14-
zephyr_iterable_section(NAME app_event_manager_postinit_hook KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN 4)
15-
zephyr_iterable_section(NAME event_submit_hook KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN 4)
16-
zephyr_iterable_section(NAME event_preprocess_hook KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN 4)
17-
zephyr_iterable_section(NAME event_postprocess_hook KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN 4)
12+
zephyr_iterable_section(NAME event_type KVMA RAM_REGION GROUP RODATA_REGION)
13+
zephyr_iterable_section(NAME event_listener KVMA RAM_REGION GROUP RODATA_REGION)
14+
zephyr_iterable_section(NAME app_event_manager_postinit_hook KVMA RAM_REGION GROUP RODATA_REGION)
15+
zephyr_iterable_section(NAME event_submit_hook KVMA RAM_REGION GROUP RODATA_REGION)
16+
zephyr_iterable_section(NAME event_preprocess_hook KVMA RAM_REGION GROUP RODATA_REGION)
17+
zephyr_iterable_section(NAME event_postprocess_hook KVMA RAM_REGION GROUP RODATA_REGION)
1818

1919
zephyr_linker_section(NAME event_subscribers_all KVMA RAM_REGION GROUP RODATA_REGION NOINPUT)
2020
zephyr_linker_section_configure(SECTION event_subscribers_all

‎subsys/app_event_manager_profiler_tracer/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@
77
zephyr_include_directories(.)
88
zephyr_sources_ifdef(CONFIG_APP_EVENT_MANAGER_PROFILER_TRACER app_event_manager_profiler_tracer.c)
99
zephyr_linker_sources(SECTIONS em_pt.ld)
10-
zephyr_iterable_section(NAME nrf_profiler_info KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN 4)
10+
zephyr_iterable_section(NAME nrf_profiler_info KVMA RAM_REGION GROUP RODATA_REGION)

‎subsys/bluetooth/adv_prov/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
zephyr_sources(core.c)
88
zephyr_linker_sources(SECTIONS core.ld)
9-
zephyr_iterable_section(NAME bt_le_adv_prov_ad KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN 4)
10-
zephyr_iterable_section(NAME bt_le_adv_prov_sd KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN 4)
9+
zephyr_iterable_section(NAME bt_le_adv_prov_ad KVMA RAM_REGION GROUP RODATA_REGION)
10+
zephyr_iterable_section(NAME bt_le_adv_prov_sd KVMA RAM_REGION GROUP RODATA_REGION)
1111

1212
add_subdirectory(providers)

‎subsys/bluetooth/services/fast_pair/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ zephyr_library_sources_ifdef(CONFIG_BT_FAST_PAIR_BOND_MANAGER fp_bond_manager.c)
2323

2424
zephyr_linker_sources_ifdef(CONFIG_BT_FAST_PAIR_ACTIVATION SECTIONS fp_activation.ld)
2525
if(CONFIG_BT_FAST_PAIR_ACTIVATION)
26-
zephyr_iterable_section(NAME fp_activation_module KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN 4)
26+
zephyr_iterable_section(NAME fp_activation_module KVMA RAM_REGION GROUP RODATA_REGION)
2727
endif()
2828
zephyr_library_sources_ifdef(CONFIG_BT_FAST_PAIR_ACTIVATION fp_activation.c)
2929

‎subsys/bluetooth/services/fast_pair/fp_storage/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ zephyr_library_named(fp_storage)
88

99
if(CONFIG_BT_FAST_PAIR_STORAGE_MANAGER)
1010
zephyr_linker_sources(SECTIONS fp_storage_manager.ld)
11-
zephyr_iterable_section(NAME fp_storage_manager_module KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN 4)
11+
zephyr_iterable_section(NAME fp_storage_manager_module KVMA RAM_REGION GROUP RODATA_REGION)
1212
target_sources(fp_storage PRIVATE fp_storage_manager.c)
1313
endif()
1414
if(CONFIG_BT_FAST_PAIR_STORAGE_AK_BACKEND_STANDARD)

‎subsys/emds/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ zephyr_sources(emds_flash.c)
99
zephyr_linker_sources(SECTIONS emds_types.ld)
1010

1111
if(DEFINED CONFIG_EMDS)
12-
zephyr_iterable_section(NAME emds_entry KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
12+
zephyr_iterable_section(NAME emds_entry KVMA RAM_REGION GROUP RODATA_REGION)
1313
endif()

0 commit comments

Comments
 (0)