From dff0dbaf3405f7d79d7a5687c7ed4ad9d9460643 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Bergman?= <bjorn.bergman@iar.com>
Date: Fri, 7 Feb 2025 12:50:11 +0100
Subject: [PATCH] toolchain: iar: use
 zephyr_linker_generate_linker_settings_file() to ilink
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Use the standard function to generate the input file to the linker
generator.

Signed-off-by: Björn Bergman <bjorn.bergman@iar.com>
---
 cmake/linker/iar/target.cmake | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/cmake/linker/iar/target.cmake b/cmake/linker/iar/target.cmake
index b8319a4751f..8e05ef068c3 100644
--- a/cmake/linker/iar/target.cmake
+++ b/cmake/linker/iar/target.cmake
@@ -41,32 +41,19 @@ macro(configure_linker_script linker_script_gen linker_pass_define)
   else()
     set(IAR_LIB_USED "")
   endif()
+  zephyr_linker_generate_linker_settings_file(${cmake_linker_script_settings})
 
-  file(GENERATE OUTPUT ${cmake_linker_script_settings} CONTENT
-       "set(FORMAT \"$<TARGET_PROPERTY:linker,FORMAT>\" CACHE INTERNAL \"\")\n
-        set(ENTRY \"$<TARGET_PROPERTY:linker,ENTRY>\" CACHE INTERNAL \"\")\n
-        set(MEMORY_REGIONS \"$<TARGET_PROPERTY:linker,MEMORY_REGIONS>\" CACHE INTERNAL \"\")\n
-        set(GROUPS \"$<TARGET_PROPERTY:linker,GROUPS>\" CACHE INTERNAL \"\")\n
-        set(SECTIONS \"$<TARGET_PROPERTY:linker,SECTIONS>\" CACHE INTERNAL \"\")\n
-        set(SECTION_SETTINGS \"$<TARGET_PROPERTY:linker,SECTION_SETTINGS>\" CACHE INTERNAL \"\")\n
-        set(SYMBOLS \"$<TARGET_PROPERTY:linker,SYMBOLS>\" CACHE INTERNAL \"\")\n
-       "
-    )
   add_custom_command(
     OUTPUT ${linker_script_gen}
            ${STEERING_FILE}
     DEPENDS
            ${extra_dependencies}
+           ${cmake_linker_script_settings}
            ${DEVICE_API_LD_TARGET}
     COMMAND ${CMAKE_COMMAND}
-      -C ${DEVICE_API_LINKER_SECTIONS_CMAKE}
       -C ${cmake_linker_script_settings}
       -DPASS="${linker_pass_define}"
       ${STEERING_FILE_ARG}
-      -DCONFIG_LINKER_LAST_SECTION_ID=${CONFIG_LINKER_LAST_SECTION_ID}
-      -DCONFIG_LINKER_LAST_SECTION_ID_PATTERN=${CONFIG_LINKER_LAST_SECTION_ID_PATTERN}
-      -DCONFIG_IAR_DATA_INIT=${CONFIG_IAR_DATA_INIT}
-      -DCONFIG_IAR_ZEPHYR_INIT=${CONFIG_IAR_ZEPHYR_INIT}
       -DOUT_FILE=${CMAKE_CURRENT_BINARY_DIR}/${linker_script_gen}
       ${IAR_LIB_USED}
       -P ${ZEPHYR_BASE}/cmake/linker/iar/config_file_script.cmake