uboot: add support for bundling ATF BL31 in ELF format into U-Boot
PATCH v3 1/1 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.
---
Changes v2 -> v3:
- change 'config' to 'choice' in uboot/Config.in
Changes v1 -> v2:
- fix wrong prefix BR_ to BR2_
--- boot/arm-trusted-firmware/arm-trusted-firmware.mk | 7 +++++++ boot/uboot/Config.in | 13 +++++++++++++ boot/uboot/uboot.mk | 4 ++++ 3 files changed, 24 insertions(+)
boot/arm-trusted-firmware/arm-trusted-firmware.mk +7 -0
@@ -94,6 +94,12 @@ ARM_TRUSTED_FIRMWARE_MAKE_OPTS += RESET_TO_BL31=1 ARM_TRUSTED_FIRMWARE_DEPENDENCIES += host-uboot-tools endif +ifeq ($(BR2_TARGET_UBOOT_NEEDS_ATF_BL31_ELF),y) +define ARM_TRUSTED_FIRMWARE_BL31_UBOOT_INSTALL_ELF + cp -dpf $(ARM_TRUSTED_FIRMWARE_IMG_DIR)/bl31/bl31.elf $(BINARIES_DIR)/ +endef +endif + define ARM_TRUSTED_FIRMWARE_BUILD_CMDS $(ARM_TRUSTED_FIRMWARE_BUILD_FIPTOOL) $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(ARM_TRUSTED_FIRMWARE_MAKE_OPTS) \
@@ -104,6 +110,7 @@ endef define ARM_TRUSTED_FIRMWARE_INSTALL_IMAGES_CMDS cp -dpf $(ARM_TRUSTED_FIRMWARE_IMG_DIR)/*.bin $(BINARIES_DIR)/ $(ARM_TRUSTED_FIRMWARE_BL31_UBOOT_INSTALL) + $(ARM_TRUSTED_FIRMWARE_BL31_UBOOT_INSTALL_ELF) endef # Configuration check
boot/uboot/Config.in +13 -0
@@ -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
boot/uboot/uboot.mk +4 -0
@@ -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
Signature · 1 line
2.18.1
PATCH v3 1/1 uboot: add support for bundling ATF BL31 in ELF format into U-Boot
Hello Micha?,
Quoted 4 lines · On Sun, 11 Nov 2018 22:39:42 +0100 Micha? ?yszczek <[email protected]>…
Rockchip's rk3328 encapsulates the BL31 part of ATP but it needs image in ELF format. This is extension to
2c4809e6088660dc71de9de8cee0bba312aafbe4
Quoted 8 lines
This commit introduces a
BR2_TARGET_UBOOT_NEEDS_ATF_BL31_ELFvariable to achieve this.Signed-off-by Micha? ?yszczek <[email protected]>---
Changes v2 -> v3:
- change 'config' to 'choice' in uboot/Config.in
Applied to master, thanks. Could you please add a new test case in support/testing/tests/boot/test_atf.py to test this additional situation ?
Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com