From a7122cf51f39c72d9210c8a6f5fa54825244ee78 Mon Sep 17 00:00:00 2001 From: Sudan Landge Date: Thu, 20 Mar 2025 12:02:18 +0000 Subject: [PATCH] boards: arm: add armfvp support for ns variants What is the change? - Non secure build variants can now be used with ARMFVPs. Why is this change needed? - Running non secure variant of a build doesn't work with FVPs previous to version 11.27. The newer version of FVP added the support to run the tfm_merged.hex files. Signed-off-by: Sudan Landge --- boards/arm/mps2/board.cmake | 4 +++- boards/arm/mps3/board.cmake | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/boards/arm/mps2/board.cmake b/boards/arm/mps2/board.cmake index b52e1958cf4..98e34a99748 100644 --- a/boards/arm/mps2/board.cmake +++ b/boards/arm/mps2/board.cmake @@ -1,5 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -# Copyright 2024 Arm Limited and/or its affiliates +# Copyright 2024-2025 Arm Limited and/or its affiliates if(CONFIG_BOARD_MPS2_AN385) set(SUPPORTED_EMU_PLATFORMS qemu armfvp) @@ -48,6 +48,8 @@ elseif(CONFIG_BOARD_MPS2_AN521_CPU0 OR CONFIG_BOARD_MPS2_AN521_CPU0_NS OR CONFIG # TF-M (Secure) & Zephyr (Non Secure) image (when running # in-tree tests). set(QEMU_KERNEL_OPTION "-device;loader,file=${CMAKE_BINARY_DIR}/zephyr/tfm_merged.hex") + + set(ARMFVP_FLAGS ${ARMFVP_FLAGS} -a ${APPLICATION_BINARY_DIR}/zephyr/tfm_merged.hex) elseif(CONFIG_OPENAMP) set(QEMU_EXTRA_FLAGS "-device;loader,file=${REMOTE_ZEPHYR_DIR}/zephyr.elf") elseif(CONFIG_BOARD_MPS2_AN521_CPU1) diff --git a/boards/arm/mps3/board.cmake b/boards/arm/mps3/board.cmake index a9a1b4a09fa..e6204c4c2ea 100644 --- a/boards/arm/mps3/board.cmake +++ b/boards/arm/mps3/board.cmake @@ -1,5 +1,5 @@ # Copyright (c) 2021 Linaro -# Copyright 2024 Arm Limited and/or its affiliates +# Copyright 2024-2025 Arm Limited and/or its affiliates # SPDX-License-Identifier: Apache-2.0 # The FVP variant must be used to enable Ethos-U55 NPU support, but QEMU also @@ -52,6 +52,8 @@ if (CONFIG_BUILD_WITH_TFM) # TF-M (Secure) & Zephyr (Non Secure) image (when running # in-tree tests). set(QEMU_KERNEL_OPTION "-device;loader,file=${CMAKE_BINARY_DIR}/zephyr/tfm_merged.hex") + + set(ARMFVP_FLAGS ${ARMFVP_FLAGS} -a ${APPLICATION_BINARY_DIR}/zephyr/tfm_merged.hex) endif() # FVP Parameters