diff --git a/CMakeLists.txt b/CMakeLists.txt index 10095f449fd..0d1c502c61e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1296,12 +1296,9 @@ else() # The final linker pass uses the same source linker script of the # previous passes, but this time with a different output # file and preprocessed with the define LINKER_ZEPHYR_FINAL. - # - # LINKER_PASS2 is deprecated but being kept to avoid breaking - # external projects. It will be removed in the future. configure_linker_script( linker.cmd - "-DLINKER_ZEPHYR_FINAL;-DLINKER_PASS2" + "-DLINKER_ZEPHYR_FINAL" ${CODE_RELOCATION_DEP} ${ZEPHYR_PREBUILT_EXECUTABLE} zephyr_generated_headers diff --git a/cmake/linker/armlink/target.cmake b/cmake/linker/armlink/target.cmake index 390b43b97eb..0943e255be0 100644 --- a/cmake/linker/armlink/target.cmake +++ b/cmake/linker/armlink/target.cmake @@ -33,7 +33,7 @@ macro(configure_linker_script linker_script_gen linker_pass_define) if("${linker_pass_define}" STREQUAL "-DLINKER_ZEPHYR_PREBUILT") set(PASS 1) - elseif("${linker_pass_define}" STREQUAL "-DLINKER_ZEPHYR_FINAL;-DLINKER_PASS2") + elseif("${linker_pass_define}" STREQUAL "-DLINKER_ZEPHYR_FINAL") set(PASS 2) set(STEERING_FILE ${CMAKE_CURRENT_BINARY_DIR}/armlink_symbol_steering.steer) set(STEERING_C ${CMAKE_CURRENT_BINARY_DIR}/armlink_symbol_steering.c) diff --git a/cmake/linker/ld/target.cmake b/cmake/linker/ld/target.cmake index b83dc5bb041..fd4b6df4fd1 100644 --- a/cmake/linker/ld/target.cmake +++ b/cmake/linker/ld/target.cmake @@ -34,7 +34,7 @@ macro(configure_linker_script linker_script_gen linker_pass_define) if(CONFIG_CMAKE_LINKER_GENERATOR) if("${linker_pass_define}" STREQUAL "-DLINKER_ZEPHYR_PREBUILT") set(PASS 1) - elseif("${linker_pass_define}" STREQUAL "-DLINKER_ZEPHYR_FINAL;-DLINKER_PASS2") + elseif("${linker_pass_define}" STREQUAL "-DLINKER_ZEPHYR_FINAL") set(PASS 2) endif()