From 690b21718ae67a972b442dc98c9eccc3f140df0c Mon Sep 17 00:00:00 2001 From: Wilfried Chauveau Date: Thu, 29 Jun 2023 10:37:08 +0100 Subject: [PATCH] tfm: Fix the merged hex file name for mps3_an547 This fixes a typo that leads to failure when running `west build` with the `run` target. Signed-off-by: Wilfried Chauveau --- boards/arm/mps3_an547/board.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boards/arm/mps3_an547/board.cmake b/boards/arm/mps3_an547/board.cmake index 4b7f8a40b7b..b8035658dd2 100644 --- a/boards/arm/mps3_an547/board.cmake +++ b/boards/arm/mps3_an547/board.cmake @@ -25,7 +25,7 @@ if (CONFIG_BUILD_WITH_TFM) # Override the binary used by qemu, to use the combined # TF-M (Secure) & Zephyr (Non Secure) image (when running # in-tree tests). - set(QEMU_KERNEL_OPTION "-device;loader,file=${CMAKE_BINARY_DIR}/zephyr/merged.hex") + set(QEMU_KERNEL_OPTION "-device;loader,file=${CMAKE_BINARY_DIR}/zephyr/tfm_merged.hex") endif() # FVP settings