aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Thomas Petazzoni <thomas.petazzoni@free-electrons.com>2017-12-03 22:48:06 +0100
committerGravatar Peter Korsgaard <peter@korsgaard.com>2017-12-08 12:27:36 +0100
commit968445911362642d4e353a4c5cdb8bc6fdaf6b92 (patch)
tree1f9104a743f3319dd302e65cf5d7107ed081ba6f
parent3f64b08ff0fa601b61b93a7c9f0553d34196dcfd (diff)
downloadbuildroot-968445911362642d4e353a4c5cdb8bc6fdaf6b92.tar.gz
buildroot-968445911362642d4e353a4c5cdb8bc6fdaf6b92.tar.bz2
arm-trusted-firmware: allow to generate the BL31 image
Some platforms (e.g Allwinner ARM64) don't build a FIP image out of ATF, but only a BL31 image, which is then encapsulated in U-Boot. This commit adds an ATF option to build such an image. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Tested-by: Jagan Teki <jagan@amarulasolutions.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
-rw-r--r--boot/arm-trusted-firmware/Config.in7
-rw-r--r--boot/arm-trusted-firmware/arm-trusted-firmware.mk4
2 files changed, 11 insertions, 0 deletions
diff --git a/boot/arm-trusted-firmware/Config.in b/boot/arm-trusted-firmware/Config.in
index b8b926982e..7aef87cb74 100644
--- a/boot/arm-trusted-firmware/Config.in
+++ b/boot/arm-trusted-firmware/Config.in
@@ -64,6 +64,13 @@ config BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP
platforms were ATF encapsulates the second stage bootloader
(such as U-Boot).
+config BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31
+ bool "Build BL31 image"
+ help
+ This option enables building the BL31 image. This is
+ typically used on platforms where another bootloader (e.g
+ U-Boot) encapsulates ATF BL31.
+
config BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33
bool "Use U-Boot as BL33"
depends on BR2_TARGET_UBOOT
diff --git a/boot/arm-trusted-firmware/arm-trusted-firmware.mk b/boot/arm-trusted-firmware/arm-trusted-firmware.mk
index 3731829d5d..0aa7c9b492 100644
--- a/boot/arm-trusted-firmware/arm-trusted-firmware.mk
+++ b/boot/arm-trusted-firmware/arm-trusted-firmware.mk
@@ -47,6 +47,10 @@ ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP),y)
ARM_TRUSTED_FIRMWARE_MAKE_TARGETS += fip
endif
+ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31),y)
+ARM_TRUSTED_FIRMWARE_MAKE_TARGETS += bl31
+endif
+
define ARM_TRUSTED_FIRMWARE_BUILD_CMDS
$(TARGET_CONFIGURE_OPTS) \
$(MAKE) -C $(@D) $(ARM_TRUSTED_FIRMWARE_MAKE_OPTS) \