Skip to content

Update the versalnet apu to load TF-A as APU runs at EL1 NS #96438

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Update the versalnet apu to load TF-A as APU runs at EL1 NS #96438

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b5996b5
modules: tf-a: Add extensible board-specific build parameter support
Sep 23, 2025
e433e9c
boards: amd: versalnet_apu: Add comprehensive TF-A build integration
Sep 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 19 additions & 6 deletions boards/amd/versalnet_apu/board.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,26 @@ set(QEMU_ARCH xilinx-aarch64)
set(QEMU_CPU_TYPE_${ARCH} cortexa78)

set(QEMU_FLAGS_${ARCH}
-machine arm-generic-fdt
-hw-dtb ${PROJECT_BINARY_DIR}/${BOARD}-qemu.dtb
-device loader,addr=0xEC200300,data=0x3EE,data-len=4 -device loader,addr=0xEC200300,data=0x3DD,data-len=4
-nographic
-m 2g
-machine arm-generic-fdt
-hw-dtb ${PROJECT_BINARY_DIR}/${BOARD}-qemu.dtb
-device loader,addr=0xEC200300,data=0x3EE,data-len=4 -device loader,addr=0xEC200300,data=0x3EE,data-len=4
-nographic
-m 2g
)

# Set TF-A platform for ARM Trusted Firmware builds
if(CONFIG_BUILD_WITH_TFA)
set(TFA_PLAT "versal_net")
# Add Versal NET specific TF-A build parameters
set(TFA_EXTRA_ARGS "TFA_NO_PM=1;PRELOADED_BL33_BASE=${CONFIG_SRAM_BASE_ADDRESS}")
if(CONFIG_TFA_MAKE_BUILD_TYPE_DEBUG)
set(BUILD_FOLDER "debug")
else()
set(BUILD_FOLDER "release")
endif()
endif()

set(QEMU_KERNEL_OPTION
-device loader,cpu-num=0,file=\$<TARGET_FILE:\${logical_target_for_zephyr_elf}>
-device loader,cpu-num=0,file=${PROJECT_BINARY_DIR}/../tfa/versal_net/${BUILD_FOLDER}/bl31/bl31.elf
-device loader,file=\$<TARGET_FILE:\${logical_target_for_zephyr_elf}>
)
1 change: 1 addition & 0 deletions boards/amd/versalnet_apu/versalnet_apu_defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# The Zephyr build from this defconfig is expected to boot from
# Xilinx Arm Trusted Firmware (ATF).
# Boot Flow is: Boot PDI -> TF-A -> Zephyr
CONFIG_BUILD_WITH_TFA=y

CONFIG_ARM64_VA_BITS_40=y
CONFIG_ARM64_PA_BITS_40=y
Expand Down
6 changes: 6 additions & 0 deletions modules/trusted-firmware-a/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,18 @@ if (CONFIG_BUILD_WITH_TFA)
set(TFA_BUILD_DEBUG "0")
endif()

# Set default TF-A build parameters that can be overridden by boards
if(NOT DEFINED TFA_EXTRA_ARGS)
set(TFA_EXTRA_ARGS "")
endif()

set_property(GLOBAL APPEND PROPERTY extra_post_build_commands
COMMAND make -C ${ZEPHYR_TRUSTED_FIRMWARE_A_MODULE_DIR}
DEBUG=${TFA_BUILD_DEBUG}
CROSS_COMPILE=${CROSS_COMPILE}
BUILD_BASE=${TFA_BINARY_DIR} PLAT=${TFA_PLAT}
BL33=${CMAKE_BINARY_DIR}/zephyr/${KERNEL_BIN_NAME}
${TFA_EXTRA_ARGS}
all fip
)
endif()