diff options
| author | Michał Łyszczek <michal.lyszczek@bofc.pl> | 2018-11-11 22:39:42 +0100 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@bootlin.com> | 2019-02-06 16:51:23 +0100 |
| commit | cab8bd3b46badb11e734e64747aee848c2b4282d (patch) | |
| tree | 8b4388fb47d69fee6b41949bbd8677c7f7312fe6 /boot/uboot | |
| parent | f6a6eca432f676a452b4e76d3b85301889c05817 (diff) | |
| download | buildroot-cab8bd3b46badb11e734e64747aee848c2b4282d.tar.gz buildroot-cab8bd3b46badb11e734e64747aee848c2b4282d.zip | |
boot/uboot: add support for bundling ATF BL31 in ELF format into U-Boot
Rockchip's rk3328 encapsulates the BL31 part of ATP but it needs
image in ELF format. This is extension to
2c4809e6088660dc71de9de8cee0bba312aafbe4
This commit introduces a BR2_TARGET_UBOOT_NEEDS_ATF_BL31_ELF variable
to achieve this.
Signed-off-by: Michał Łyszczek <michal.lyszczek@bofc.pl>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Diffstat (limited to 'boot/uboot')
| -rw-r--r-- | boot/uboot/Config.in | 13 | ||||
| -rw-r--r-- | boot/uboot/uboot.mk | 4 |
2 files changed, 17 insertions, 0 deletions
diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in index ac6f8bc8c1..cbbbd5f1a4 100644 --- a/boot/uboot/Config.in +++ b/boot/uboot/Config.in @@ -179,6 +179,19 @@ config BR2_TARGET_UBOOT_NEEDS_ATF_BL31 variable pointing to ATF's BL31 binary, is passed during the Buildroot build. +choice + prompt "U-Boot ATF BL31 format" + depends on BR2_TARGET_UBOOT_NEEDS_ATF_BL31 + default BR2_TARGET_UBOOT_NEEDS_ATF_BL31_BIN + +config BR2_TARGET_UBOOT_NEEDS_ATF_BL31_BIN + bool "bl31.bin" + +config BR2_TARGET_UBOOT_NEEDS_ATF_BL31_ELF + bool "bl31.elf" + +endchoice + menu "U-Boot binary format" config BR2_TARGET_UBOOT_FORMAT_AIS diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index 6977bcc064..3c070b41b3 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -137,8 +137,12 @@ UBOOT_MAKE_OPTS += \ ifeq ($(BR2_TARGET_UBOOT_NEEDS_ATF_BL31),y) UBOOT_DEPENDENCIES += arm-trusted-firmware +ifeq ($(BR2_TARGET_UBOOT_NEEDS_ATF_BL31_ELF),y) +UBOOT_MAKE_OPTS += BL31=$(BINARIES_DIR)/bl31.elf +else UBOOT_MAKE_OPTS += BL31=$(BINARIES_DIR)/bl31.bin endif +endif ifeq ($(BR2_TARGET_UBOOT_NEEDS_DTC),y) UBOOT_DEPENDENCIES += host-dtc |
