From 5452d68de9c16a06afc4e7f616f19777da730a32 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 21f19db890..3308701883 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_TI_K3_DM bool "U-Boot needs TI K3 Device Manager (DM)" # We use the SoC selection defined for the ti-k3-image-gen diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index dda606a880..17a044f668 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -183,7 +183,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 ifeq ($(BR2_TARGET_UBOOT_NEEDS_TI_K3_DM),y) -- 2.34.1