mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-09-30 22:11:59 -09:00
Code Issues Packages Projects Releases Wiki Activity

boot/uboot: add support for bundling TEE in ELF format into U-Boot

Browse Source 
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>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Christoph Muellner
2020-01-19 01:28:05 +01:00
committed by Thomas Petazzoni
parent 0979a9e13c
commit 5521539eb1
2 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
boot/uboot/Config.in
View File

@@ -229,6 +229,15 @@ config BR2_TARGET_UBOOT_NEEDS_ATF_BL31_ELF
endchoice 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.
config BR2_TARGET_UBOOT_NEEDS_OPENSBI config BR2_TARGET_UBOOT_NEEDS_OPENSBI
bool "U-Boot needs OpenSBI" bool "U-Boot needs OpenSBI"
depends on BR2_TARGET_OPENSBI depends on BR2_TARGET_OPENSBI

5
boot/uboot/uboot.mk
View File

@@ -175,6 +175,11 @@ UBOOT_PRE_BUILD_HOOKS += UBOOT_COPY_ATF_FIRMWARE
endif endif
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_OPENSBI),y) ifeq ($(BR2_TARGET_UBOOT_NEEDS_OPENSBI),y)
UBOOT_DEPENDENCIES += opensbi UBOOT_DEPENDENCIES += opensbi
UBOOT_MAKE_OPTS += OPENSBI=$(BINARIES_DIR)/fw_dynamic.bin UBOOT_MAKE_OPTS += OPENSBI=$(BINARIES_DIR)/fw_dynamic.bin