Change in coreboot[master]: arch/arm64: Add Kconfig to include BL31 as blob

[Patrick Rudolph (Code Review)]

Patrick Rudolph has uploaded this change for review. ( https://review.coreboot.org/27559

Change subject: arch/arm64: Add Kconfig to include BL31 as blob
......................................................................

arch/arm64: Add Kconfig to include BL31 as blob

Add Kconfig options to not build the ATF, but use a precompiled
binary instead. To be used on platforms that do not have upstream
ATF support.

Change-Id: I17954247029df627a3f4db8b73993bd549e55967
Signed-off-by: Patrick Rudolph 
---
M src/arch/arm64/Kconfig
M src/arch/arm64/Makefile.inc
2 files changed, 23 insertions(+), 0 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/59/27559/1

diff --git a/src/arch/arm64/Kconfig b/src/arch/arm64/Kconfig
index cae558b..2ce9f68 100644
--- a/src/arch/arm64/Kconfig
+++ b/src/arch/arm64/Kconfig
@@ -31,6 +31,20 @@
    default n
    depends on ARCH_RAMSTAGE_ARM64

+config ARM64_BUILD_ARM_TRUSTED_FIRMWARE
+	bool
+	default y
+	depends on ARM64_USE_ARM_TRUSTED_FIRMWARE
+	help
+	  If false include bl31.elf from blobs repo.
+
+config ARM64_BL31_BLOB
+	string "Precompiled BL31.ELF to use as ATF"
+	depends on ARM64_USE_ARM_TRUSTED_FIRMWARE
+	depends on !ARM64_BUILD_ARM_TRUSTED_FIRMWARE
+	help
+	  The blob to use if not building the ATF in tree.
+
 config ARM64_USE_SECURE_OS
    bool
    default n
diff --git a/src/arch/arm64/Makefile.inc b/src/arch/arm64/Makefile.inc
index 3c3cd20..12c7392 100644
--- a/src/arch/arm64/Makefile.inc
+++ b/src/arch/arm64/Makefile.inc
@@ -156,6 +156,8 @@

ifeq ($(CONFIG_ARM64_USE_ARM_TRUSTED_FIRMWARE),y)

+ifeq ($(CONFIG_ARM64_BUILD_ARM_TRUSTED_FIRMWARE), y)
+
 BL31_SOURCE := $(top)/3rdparty/arm-trusted-firmware
 BL31_BUILD := $(abspath $(obj)/3rdparty/arm-trusted-firmware)
 BL31_TARGET := $(BL31_BUILD)/bl31/bl31.elf
@@ -205,6 +207,13 @@

.PHONY: $(BL31)

+else
+
+BL31 := $(call strip_quotes,$(CONFIG_ARM64_BL31_BLOB))
+
+endif # CONFIG_ARM64_BUILD_ARM_TRUSTED_FIRMWARE
+
+
 BL31_CBFS := $(CONFIG_CBFS_PREFIX)/bl31
 $(BL31_CBFS)-file := $(BL31)
 $(BL31_CBFS)-type := payload