Commit a7122cf5 authored by Sudan Landge's avatar Sudan Landge Committed by Benjamin Cabé
Browse files

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: default avatarSudan Landge <sudan.landge@arm.com>
parent a1e3083d

boards/arm/mps2/board.cmake

+3 −1
Changes for boards/arm/mps2/board.cmake: 3 added lines, 1 removed line.
Original line number Diff line number Diff line 
# 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)

boards/arm/mps3/board.cmake

+3 −1
Changes for boards/arm/mps3/board.cmake: 3 added lines, 1 removed line.
Original line number Diff line number Diff line 
# 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

CRA Git | Maintained and supported by SUSTech CRA and CCSE