michaelh/zephyr
1
0
Fork 0
Code Releases Activity

boards: arm: add armfvp support for ns variants

Browse source 
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 <sudan.landge@arm.com>
This commit is contained in:
Sudan Landge 2025-03-20 12:02:18 +00:00 • committed by Benjamin Cabé
commit a7122cf51f
2 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
boards/arm/mps2/board.cmake
View file

@ -1,5 +1,5 @@
# SPDX-License-Identifier: Apache-2.0
# Copyright 2024 Arm Limited and/or its affiliates <open-source-office@arm.com>
# Copyright 2024-2025 Arm Limited and/or its affiliates <open-source-office@arm.com>
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)

4
boards/arm/mps3/board.cmake
View file

@ -1,5 +1,5 @@
# Copyright (c) 2021 Linaro
# Copyright 2024 Arm Limited and/or its affiliates <open-source-office@arm.com>
# Copyright 2024-2025 Arm Limited and/or its affiliates <open-source-office@arm.com>
# 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