diff options
| author | Mark Horvath <mark.horvath@arm.com> | 2021-01-15 16:10:22 +0100 |
|---|---|---|
| committer | Anton Komlev <Anton.Komlev@arm.com> | 2021-01-22 00:36:26 +0000 |
| commit | 531fce8f8112e7d3c32783e68dc1de1534369bfd (patch) | |
| tree | 169bce755188d2bcf58eb757df5ae50c8fba8f91 /bl2 | |
| parent | 2cd2ab7ef1f781a317d8003ae1d13d0eac5d9faf (diff) | |
Build: Create NS signing layout even if NS build is disabled
The NS signing layout is a build output even if NS side was not built,
so it is neecessary to create it always.
Change-Id: Ifa30d7988b6a34cf95dde322952ed097c2ece686
Signed-off-by: Mark Horvath <mark.horvath@arm.com>
Diffstat (limited to 'bl2')
| -rw-r--r-- | bl2/ext/mcuboot/CMakeLists.txt | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/bl2/ext/mcuboot/CMakeLists.txt b/bl2/ext/mcuboot/CMakeLists.txt index 45d7ce385..f757e2c79 100644 --- a/bl2/ext/mcuboot/CMakeLists.txt +++ b/bl2/ext/mcuboot/CMakeLists.txt @@ -133,27 +133,27 @@ add_custom_command(OUTPUT tfm_s_signed.bin COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/tfm_s_signed.bin $<TARGET_FILE_DIR:bl2> ) -if(NS) - set(FLASH_AREA_NUM 1) - configure_file(signing_layout.c.in signing_layout_ns.c @ONLY) - - add_library(signing_layout_ns OBJECT ${CMAKE_CURRENT_BINARY_DIR}/signing_layout_ns.c) - target_compile_options(signing_layout_ns - PRIVATE - $<$<C_COMPILER_ID:GNU>:-E\;-xc> - $<$<C_COMPILER_ID:ARMClang>:-E\;-xc> - $<$<C_COMPILER_ID:IAR>:--preprocess=ns\;$<TARGET_OBJECTS:signing_layout_ns>> - ) - target_compile_definitions(signing_layout_ns - PRIVATE - $<$<BOOL:${BL2}>:BL2> - $<$<BOOL:${MCUBOOT_IMAGE_NUMBER}>:MCUBOOT_IMAGE_NUMBER=${MCUBOOT_IMAGE_NUMBER}> - ) - target_link_libraries(signing_layout_ns - PRIVATE - platform_bl2 - ) +set(FLASH_AREA_NUM 1) +configure_file(signing_layout.c.in signing_layout_ns.c @ONLY) +add_library(signing_layout_ns OBJECT ${CMAKE_CURRENT_BINARY_DIR}/signing_layout_ns.c) +target_compile_options(signing_layout_ns + PRIVATE + $<$<C_COMPILER_ID:GNU>:-E\;-xc> + $<$<C_COMPILER_ID:ARMClang>:-E\;-xc> + $<$<C_COMPILER_ID:IAR>:--preprocess=ns\;$<TARGET_OBJECTS:signing_layout_ns>> +) +target_compile_definitions(signing_layout_ns + PRIVATE + $<$<BOOL:${BL2}>:BL2> + $<$<BOOL:${MCUBOOT_IMAGE_NUMBER}>:MCUBOOT_IMAGE_NUMBER=${MCUBOOT_IMAGE_NUMBER}> +) +target_link_libraries(signing_layout_ns + PRIVATE + platform_bl2 +) + +if(NS) add_custom_target(tfm_ns_signed_bin SOURCES tfm_ns_signed.bin ) |