Skip to content

Commit 5b2b422

Browse files
RobinKastbergcarlescufi
RobinKastberg
authored and
carlescufi
committed
iar: cmake: linker generator fixes
Fixes needed to compile using IAR. Signed-off-by: Robin Kastberg <robin.kastberg@iar.com>
1 parent 1cdc508 commit 5b2b422

9 files changed

Lines changed: 34 additions & 3 deletions

File tree

‎applications/nrf_desktop/CMakeLists.txt‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,4 +49,9 @@ endif()
4949

5050
if(CONFIG_DESKTOP_CONFIG_CHANNEL_ENABLE)
5151
zephyr_linker_sources(SECTIONS nrf_desktop.ld)
52+
zephyr_linker_section(NAME config_channel_modules KVMA RAM_REGION GROUP RODATA_REGION NOINPUT)
53+
zephyr_linker_section_configure(SECTION config_channel_modules
54+
INPUT "config_channel_modules"
55+
SYMBOLS __start_config_channel_modules __stop_config_channel_modules
56+
KEEP SORT NAME)
5257
endif()

‎subsys/app_event_manager/CMakeLists.txt‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,15 @@ 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)
18+
19+
zephyr_linker_section(NAME event_subscribers_all KVMA RAM_REGION GROUP RODATA_REGION NOINPUT)
20+
zephyr_linker_section_configure(SECTION event_subscribers_all
21+
INPUT "event_subscribers_*"
22+
SYMBOLS "__start_event_subscribers_all" "__stop_event_subscribers_all"
23+
KEEP SORT NAME)

‎subsys/app_event_manager_profiler_tracer/CMakeLists.txt‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,5 @@
66

77
zephyr_include_directories(.)
88
zephyr_sources_ifdef(CONFIG_APP_EVENT_MANAGER_PROFILER_TRACER app_event_manager_profiler_tracer.c)
9-
if(CONFIG_APP_EVENT_MANAGER_PROFILER_TRACER)
109
zephyr_linker_sources(SECTIONS em_pt.ld)
11-
endif()
10+
zephyr_iterable_section(NAME nrf_profiler_info KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN 4)

‎subsys/bluetooth/adv_prov/CMakeLists.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +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)
911

1012
add_subdirectory(providers)

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@ zephyr_library_sources_ifdef(CONFIG_BT_FAST_PAIR_STORAGE_INTEGRATION fp_storage_
2222
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)
25+
if(CONFIG_BT_FAST_PAIR_ACTIVATION)
26+
zephyr_iterable_section(NAME fp_activation_module KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN 4)
27+
endif()
2528
zephyr_library_sources_ifdef(CONFIG_BT_FAST_PAIR_ACTIVATION fp_activation.c)
2629

2730
if(CONFIG_BT_FAST_PAIR_CRYPTO)

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +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)
1112
target_sources(fp_storage PRIVATE fp_storage_manager.c)
1213
endif()
1314
if(CONFIG_BT_FAST_PAIR_STORAGE_AK_BACKEND_STANDARD)

‎subsys/caf/events/CMakeLists.txt‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,3 +65,8 @@ zephyr_sources_ifdef(CONFIG_CAF_SENSOR_DATA_AGGREGATOR_EVENTS
6565
)
6666

6767
zephyr_linker_sources(SECTIONS module_id_list.ld)
68+
zephyr_linker_section(NAME module_id_list_all KVMA RAM_REGION GROUP RODATA_REGION NOINPUT)
69+
zephyr_linker_section_configure(SECTION module_id_list_all
70+
INPUT "module_id_list"
71+
SYMBOLS "__start_module_id_list" "__stop_module_id_list"
72+
KEEP)

‎subsys/emds/CMakeLists.txt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,7 @@
77
zephyr_sources(emds.c)
88
zephyr_sources(emds_flash.c)
99
zephyr_linker_sources(SECTIONS emds_types.ld)
10+
11+
if(DEFINED CONFIG_EMDS)
12+
zephyr_iterable_section(NAME emds_entry KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
13+
endif()

‎subsys/nrf_compress/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
zephyr_library_named(nrf_compress)
88
zephyr_library_sources(src/implementation.c)
99
zephyr_linker_sources(SECTIONS sections.ld)
10-
zephyr_iterable_section(NAME nrf_compress_implementation KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN CONFIG_LINKER_ITERABLE_SUBALIGN)
10+
zephyr_iterable_section(NAME nrf_compress_implementation KVMA RAM_REGION GROUP RODATA_REGION SUBALIGN ${CONFIG_LINKER_ITERABLE_SUBALIGN})
1111

1212
if(CONFIG_NRF_COMPRESS_LZMA OR CONFIG_NRF_COMPRESS_ARM_THUMB)
1313
zephyr_library_include_directories(lzma)

0 commit comments

Comments
 (0)