From 9e84475a6327d0f94c987d0b9fd676b732d140e8 Mon Sep 17 00:00:00 2001 From: Frank Hunleth Date: Sun, 7 May 2023 20:26:57 -0400 Subject: [PATCH] uboot: support alternative TEE filenames The Beagleplay, for example, uses tee-pageable_v2.bin, so this change makes it possible to specify that file while still depending on OPTEE being built first. Signed-off-by: Frank Hunleth --- boot/uboot/Config.in | 10 ++++++++++ boot/uboot/uboot.mk | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in index d0901edc9d..bfabff15a1 100644 --- a/boot/uboot/Config.in +++ b/boot/uboot/Config.in @@ -240,6 +240,16 @@ config BR2_TARGET_UBOOT_NEEDS_OPTEE_TEE U-Boot, and that the TEE variable pointing to OPTEE's tee.elf, is passed during the Buildroot build. +if BR2_TARGET_UBOOT_NEEDS_OPTEE_TEE + +config BR2_TARGET_UBOOT_OPTEE_TEE_NAME + string "OPTEE TEE filename" + default "tee.elf" + help + Name of the OPTEE TEE file. + +endif + config BR2_TARGET_UBOOT_NEEDS_OPENSBI bool "U-Boot needs OpenSBI" depends on BR2_TARGET_OPENSBI diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index b9f165f041..4c9054115e 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -191,7 +191,7 @@ endif ifeq ($(BR2_TARGET_UBOOT_NEEDS_OPTEE_TEE),y) UBOOT_DEPENDENCIES += optee-os -UBOOT_MAKE_OPTS += TEE=$(BINARIES_DIR)/tee.elf +UBOOT_MAKE_OPTS += TEE=$(BINARIES_DIR)/$(BR2_TARGET_UBOOT_OPTEE_TEE_NAME) endif # TI K3 devices needs at least ti-sysfw (System Firmware) provided -- 2.34.1