patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 8 Packages Projects Releases Wiki Activity

cmake: remove LINKER_PASS2 define

Browse source 
This option was deprecated for the v2.6 release, and has therefore met
the 2 release deprecation cycle requirements.

Signed-off-by: Jordan Yates <jordan.yates@data61.csiro.au>
This commit is contained in:
Jordan Yates 2021-10-07 18:57:33 +10:00 committed by Carles Cufí
parent 7468121f19
commit 9c4366f1ae
3 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
CMakeLists.txt
View file

@ -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

2
cmake/linker/armlink/target.cmake
View file

@ -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)

2
cmake/linker/ld/target.cmake
View file

@ -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()