aboutsummaryrefslogtreecommitdiff
path: root/bl2
diff options
context:
space:
mode:
authorSherry Zhang <sherry.zhang2@arm.com>2021-04-20 18:29:19 +0800
committerKen Liu <ken.liu@arm.com>2021-04-22 04:30:57 +0200
commit4c9b0edfdc2e8684a43566f79a6c3c9442ef8ff4 (patch)
tree5028ebdc95ee3e3c6eeb8a47948deae81a0346a8 /bl2
parent4ecea99b3f0938d4c66cac10e7fb35e5a731a7d2 (diff)
downloadtrusted-firmware-m-4c9b0edfdc2e8684a43566f79a6c3c9442ef8ff4.tar.gz
Build: Fix imgtool package path set
The imgtool from upstream MCUBoot repo is perferred. Change-Id: I6681431447f9e0fc7830c71b1a7c888ea46d989b Signed-off-by: Sherry Zhang <sherry.zhang2@arm.com>
Diffstat (limited to 'bl2')
-rw-r--r--bl2/ext/mcuboot/CMakeLists.txt3
1 files changed, 2 insertions, 1 deletions
diff --git a/bl2/ext/mcuboot/CMakeLists.txt b/bl2/ext/mcuboot/CMakeLists.txt
index 99fe85b84..169fe7b80 100644
--- a/bl2/ext/mcuboot/CMakeLists.txt
+++ b/bl2/ext/mcuboot/CMakeLists.txt
@@ -205,6 +205,7 @@ if(NS)
)
else()
add_custom_command(OUTPUT tfm_s_ns_signed.bin
+ WORKING_DIRECTORY ${MCUBOOT_PATH}/scripts
DEPENDS tfm_s_ns_bin tfm_s_ns.bin
DEPENDS signing_layout_s
@@ -223,7 +224,7 @@ if(NS)
-s ${MCUBOOT_SECURITY_COUNTER_S}
$<$<STREQUAL:${MCUBOOT_UPGRADE_STRATEGY},OVERWRITE_ONLY>:--overwrite-only>
$<$<BOOL:${MCUBOOT_ENC_IMAGES}>:-E${MCUBOOT_KEY_ENC}>
- tfm_s_ns.bin
+ ${CMAKE_CURRENT_BINARY_DIR}/tfm_s_ns.bin
${CMAKE_CURRENT_BINARY_DIR}/tfm_s_ns_signed.bin
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/tfm_s_ns_signed.bin $<TARGET_FILE_DIR:bl2>
)