Skip to content

Commit

Permalink
cmake: armfvp: permit run zephyr together with tf-a
Browse files Browse the repository at this point in the history
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 <[email protected]>
  • Loading branch information
SgrrZhf authored and fabiobaltieri committed Sep 9, 2022
1 parent 97897a0 commit dab22aa
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion cmake/emu/armfvp.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit dab22aa

Please sign in to comment.