From 00886048b27d7b86d38282a8dbd5ec3c2bcb48f0 Mon Sep 17 00:00:00 2001 From: Neal Frager Date: Fri, 5 Dec 2025 16:43:46 +0000 Subject: [PATCH] configs/versal2_vek385_defconfig: add optee_os support Add optee_os to the default configuration for versal2 devices including an example with the versal2_vek385_defconfig. Since not all versal2 optee_os features are upstream, use the downstream Xilinx release tag xlnx_rebase_v4.5.0_2025.2 for version xilinx_v2025.2 which is based on optee_os v4.5.0. Signed-off-by: Neal Frager Signed-off-by: Julien Olivain --- board/versal2/post-image.sh | 1 + board/versal2/readme.txt | 1 + configs/versal2_vek385_defconfig | 6 ++++++ 3 files changed, 8 insertions(+) diff --git a/board/versal2/post-image.sh b/board/versal2/post-image.sh index 36cd2eda19..17746271e1 100755 --- a/board/versal2/post-image.sh +++ b/board/versal2/post-image.sh @@ -19,6 +19,7 @@ cat <<-__HEADER_EOF > "${BINARIES_DIR}/bootgen.bif" id = 0x1c000000, name=apu_subsystem { type=raw, load=0x01000000, file=${BINARIES_DIR}/u-boot.dtb } { core=a78-0, cluster=0, exception_level=el-3, trustzone, file=${BINARIES_DIR}/bl31.elf } + { core=a78-0, cluster=0, exception_level=el-1, trustzone, load=0x1800000, file=${BINARIES_DIR}/tee-raw.bin } { core=a78-0, cluster=0, exception_level=el-2, file=${BINARIES_DIR}/u-boot.elf } } } diff --git a/board/versal2/readme.txt b/board/versal2/readme.txt index fd7d092cc4..4498392bcb 100644 --- a/board/versal2/readme.txt +++ b/board/versal2/readme.txt @@ -41,6 +41,7 @@ After building, you should get a tree like this: +-- rootfs.ext4 -> rootfs.ext2 +-- sdcard.img +-- system.dtb -> u-boot.dtb + +-- tee-raw.bin +-- u-boot.dtb `-- u-boot.elf diff --git a/configs/versal2_vek385_defconfig b/configs/versal2_vek385_defconfig index a2d57a0976..9a70a6bcb2 100644 --- a/configs/versal2_vek385_defconfig +++ b/configs/versal2_vek385_defconfig @@ -26,6 +26,12 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,ar BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="versal2" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="VERSAL2_CONSOLE=cadence1" +BR2_TARGET_OPTEE_OS=y +BR2_TARGET_OPTEE_OS_CUSTOM_TARBALL=y +BR2_TARGET_OPTEE_OS_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,optee_os,xlnx_rebase_v4.5.0_2025.2)/xlnx_rebase_v4.5.0_2025.2.tar.gz" +BR2_TARGET_OPTEE_OS_NEEDS_DTC=y +BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY=y +BR2_TARGET_OPTEE_OS_PLATFORM="versal2" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y