From dab22aac7a0b67a5c04bc9ea1a88653542fb2329 Mon Sep 17 00:00:00 2001 From: Huifeng Zhang Date: Fri, 8 Jul 2022 10:47:58 +0800 Subject: [PATCH] cmake: armfvp: permit run zephyr together with tf-a As the TF-A was integrated into zephyr as a module. This adds necessary CMake scripts to load BL1 and FIP binary built from TF-A. Signed-off-by: Huifeng Zhang --- cmake/emu/armfvp.cmake | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/cmake/emu/armfvp.cmake b/cmake/emu/armfvp.cmake index 2f7f8329d954..cd33c92230f5 100644 --- a/cmake/emu/armfvp.cmake +++ b/cmake/emu/armfvp.cmake @@ -29,7 +29,12 @@ if(ARMFVP AND (DEFINED ARMFVP_MIN_VERSION)) endif() endif() -if(CONFIG_ARMV8_A_NS) +if(CONFIG_BUILD_WITH_TFA) + set(ARMFVP_FLAGS ${ARMFVP_FLAGS} + -C bp.secureflashloader.fname=${APPLICATION_BINARY_DIR}/tfa${FVP_SECURE_FLASH_FILE} + -C bp.flashloader0.fname=${APPLICATION_BINARY_DIR}/tfa${FVP_FLASH_FILE} + ) +elseif(CONFIG_ARMV8_A_NS) foreach(filetype BL1 FIP) if ((NOT DEFINED ARMFVP_${filetype}_FILE) AND (EXISTS "$ENV{ARMFVP_${filetype}_FILE}")) set(ARMFVP_${filetype}_FILE "$ENV{ARMFVP_${filetype}_FILE}" CACHE FILEPATH