Skip to content

Commit dff0dba

Browse files
bjorniuppsalafabiobaltieri
authored andcommitted
toolchain: iar: use zephyr_linker_generate_linker_settings_file() to ilink
Use the standard function to generate the input file to the linker generator. Signed-off-by: Björn Bergman <bjorn.bergman@iar.com>
1 parent 4cebced commit dff0dba

File tree

1 file changed

+2
-15
lines changed

1 file changed

+2
-15
lines changed

cmake/linker/iar/target.cmake

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -41,32 +41,19 @@ macro(configure_linker_script linker_script_gen linker_pass_define)
4141
else()
4242
set(IAR_LIB_USED "")
4343
endif()
44+
zephyr_linker_generate_linker_settings_file(${cmake_linker_script_settings})
4445

45-
file(GENERATE OUTPUT ${cmake_linker_script_settings} CONTENT
46-
"set(FORMAT \"$<TARGET_PROPERTY:linker,FORMAT>\" CACHE INTERNAL \"\")\n
47-
set(ENTRY \"$<TARGET_PROPERTY:linker,ENTRY>\" CACHE INTERNAL \"\")\n
48-
set(MEMORY_REGIONS \"$<TARGET_PROPERTY:linker,MEMORY_REGIONS>\" CACHE INTERNAL \"\")\n
49-
set(GROUPS \"$<TARGET_PROPERTY:linker,GROUPS>\" CACHE INTERNAL \"\")\n
50-
set(SECTIONS \"$<TARGET_PROPERTY:linker,SECTIONS>\" CACHE INTERNAL \"\")\n
51-
set(SECTION_SETTINGS \"$<TARGET_PROPERTY:linker,SECTION_SETTINGS>\" CACHE INTERNAL \"\")\n
52-
set(SYMBOLS \"$<TARGET_PROPERTY:linker,SYMBOLS>\" CACHE INTERNAL \"\")\n
53-
"
54-
)
5546
add_custom_command(
5647
OUTPUT ${linker_script_gen}
5748
${STEERING_FILE}
5849
DEPENDS
5950
${extra_dependencies}
51+
${cmake_linker_script_settings}
6052
${DEVICE_API_LD_TARGET}
6153
COMMAND ${CMAKE_COMMAND}
62-
-C ${DEVICE_API_LINKER_SECTIONS_CMAKE}
6354
-C ${cmake_linker_script_settings}
6455
-DPASS="${linker_pass_define}"
6556
${STEERING_FILE_ARG}
66-
-DCONFIG_LINKER_LAST_SECTION_ID=${CONFIG_LINKER_LAST_SECTION_ID}
67-
-DCONFIG_LINKER_LAST_SECTION_ID_PATTERN=${CONFIG_LINKER_LAST_SECTION_ID_PATTERN}
68-
-DCONFIG_IAR_DATA_INIT=${CONFIG_IAR_DATA_INIT}
69-
-DCONFIG_IAR_ZEPHYR_INIT=${CONFIG_IAR_ZEPHYR_INIT}
7057
-DOUT_FILE=${CMAKE_CURRENT_BINARY_DIR}/${linker_script_gen}
7158
${IAR_LIB_USED}
7259
-P ${ZEPHYR_BASE}/cmake/linker/iar/config_file_script.cmake

0 commit comments

Comments
 (0)