From 5f14178dcaedc5a6ae50f4bf80a983926f3bf205 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 | 8 ++++++++ boot/uboot/uboot.mk | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in index f5c20f5168..438a8ae381 100644 --- a/boot/uboot/Config.in +++ b/boot/uboot/Config.in @@ -240,6 +240,14 @@ 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 4eae8e95c3..5710b18eec 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -181,7 +181,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_OPENSBI),y) -- 2.34.1