* [Buildroot] [PATCH 1/1] boot/uboot: add support for bundling TEE in ELF format into U-Boot
@ 2020-01-19 0:28 Christoph Muellner
2021-12-30 14:27 ` Thomas Petazzoni
0 siblings, 1 reply; 2+ messages in thread
From: Christoph Muellner @ 2020-01-19 0:28 UTC (permalink / raw)
To: buildroot
Some U-Boot platforms (e.g. rockchip) can bundle OPTEE's tee.elf
into the U-Boot image. This patch brings the necessary changes to
enable this feature.
Signed-off-by: Christoph Muellner <christoph.muellner@theobroma-systems.com>
---
boot/uboot/Config.in | 10 ++++++++++
boot/uboot/uboot.mk | 5 +++++
2 files changed, 15 insertions(+)
diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in
index ffc441d670..1c1ab3907a 100644
--- a/boot/uboot/Config.in
+++ b/boot/uboot/Config.in
@@ -202,6 +202,16 @@ config BR2_TARGET_UBOOT_NEEDS_ATF_BL31_ELF
endchoice
+config BR2_TARGET_UBOOT_NEEDS_OPTEE_TEE
+ bool "U-Boot needs OPTEE TEE"
+ depends on BR2_TARGET_OPTEE_OS_CORE
+ help
+ Some platforms (such as Rockchip) encapsulate the TEE
+ inside U-Boot. This option makes sure optee-os gets
+ built prior to U-Boot, and that the TEE variable
+ pointing to OPTEE's tee.elf, is passed during the
+ Buildroot build.
+
menu "U-Boot binary format"
config BR2_TARGET_UBOOT_FORMAT_AIS
diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk
index a4879bb8b2..8dc932def6 100644
--- a/boot/uboot/uboot.mk
+++ b/boot/uboot/uboot.mk
@@ -150,6 +150,11 @@ UBOOT_MAKE_OPTS += BL31=$(BINARIES_DIR)/bl31.bin
endif
endif
+ifeq ($(BR2_TARGET_UBOOT_NEEDS_OPTEE_TEE),y)
+UBOOT_DEPENDENCIES += optee-os
+UBOOT_MAKE_OPTS += TEE=$(BINARIES_DIR)/tee.elf
+endif
+
ifeq ($(BR2_TARGET_UBOOT_NEEDS_DTC),y)
UBOOT_DEPENDENCIES += host-dtc
endif
--
2.11.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [Buildroot] [PATCH 1/1] boot/uboot: add support for bundling TEE in ELF format into U-Boot
2020-01-19 0:28 [Buildroot] [PATCH 1/1] boot/uboot: add support for bundling TEE in ELF format into U-Boot Christoph Muellner
@ 2021-12-30 14:27 ` Thomas Petazzoni
0 siblings, 0 replies; 2+ messages in thread
From: Thomas Petazzoni @ 2021-12-30 14:27 UTC (permalink / raw)
To: Christoph Muellner; +Cc: buildroot
On Sun, 19 Jan 2020 01:28:05 +0100
Christoph Muellner <christoph.muellner@theobroma-systems.com> wrote:
> Some U-Boot platforms (e.g. rockchip) can bundle OPTEE's tee.elf
> into the U-Boot image. This patch brings the necessary changes to
> enable this feature.
>
> Signed-off-by: Christoph Muellner <christoph.muellner@theobroma-systems.com>
> ---
> boot/uboot/Config.in | 10 ++++++++++
> boot/uboot/uboot.mk | 5 +++++
> 2 files changed, 15 insertions(+)
Sorry for the veeeeeeeeeeeery long delay, but I finally applied your
patch to master. Thanks!
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-12-30 14:27 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-01-19 0:28 [Buildroot] [PATCH 1/1] boot/uboot: add support for bundling TEE in ELF format into U-Boot Christoph Muellner
2021-12-30 14:27 ` Thomas Petazzoni
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.