<p>Philipp Deppenwiese <strong>merged</strong> this change.</p><p><a href="https://review.coreboot.org/27559">View Change</a></p><div style="white-space:pre-wrap">Approvals:
build bot (Jenkins): Verified
Philipp Deppenwiese: Looks good to me, approved
Julius Werner: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">arch/arm64: Add Kconfig to include BL31 as blob<br><br>Add Kconfig options to not build the Arm Trusted Firmware, but use<br>a precompiled binary instead. To be used on platforms that do not<br>have upstream Arm Trusted Firmware support and useful for development<br>purposes.<br><br>It is recommended to use upstream Arm Trusted Firmware where possible.<br><br>Change-Id: I17954247029df627a3f4db8b73993bd549e55967<br>Signed-off-by: Patrick Rudolph <patrick.rudolph@9elements.com><br>Reviewed-on: https://review.coreboot.org/27559<br>Tested-by: build bot (Jenkins) <no-reply@coreboot.org><br>Reviewed-by: Julius Werner <jwerner@chromium.org><br>Reviewed-by: Philipp Deppenwiese <zaolin.daisuki@gmail.com><br>---<br>M src/arch/arm64/Kconfig<br>M src/arch/arm64/Makefile.inc<br>2 files changed, 17 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/arch/arm64/Kconfig b/src/arch/arm64/Kconfig</span><br><span>index cae558b..71c9f04 100644</span><br><span>--- a/src/arch/arm64/Kconfig</span><br><span>+++ b/src/arch/arm64/Kconfig</span><br><span>@@ -31,6 +31,14 @@</span><br><span> default n</span><br><span> depends on ARCH_RAMSTAGE_ARM64</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+config ARM64_BL31_EXTERNAL_FILE</span><br><span style="color: hsl(120, 100%, 40%);">+ string "Path to external BL31.ELF (leave empty to build from source)"</span><br><span style="color: hsl(120, 100%, 40%);">+ depends on ARM64_USE_ARM_TRUSTED_FIRMWARE</span><br><span style="color: hsl(120, 100%, 40%);">+ help</span><br><span style="color: hsl(120, 100%, 40%);">+ The blob to use instead of building the Arm Trusted Firmware</span><br><span style="color: hsl(120, 100%, 40%);">+ from tree. It is discouraged as compatibility with out-of-tree</span><br><span style="color: hsl(120, 100%, 40%);">+ blobs may break anytime.</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> config ARM64_USE_SECURE_OS</span><br><span> bool</span><br><span> default n</span><br><span>diff --git a/src/arch/arm64/Makefile.inc b/src/arch/arm64/Makefile.inc</span><br><span>index 3c3cd20..e2c44eb4 100644</span><br><span>--- a/src/arch/arm64/Makefile.inc</span><br><span>+++ b/src/arch/arm64/Makefile.inc</span><br><span>@@ -156,6 +156,8 @@</span><br><span> </span><br><span> ifeq ($(CONFIG_ARM64_USE_ARM_TRUSTED_FIRMWARE),y)</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ifeq ($(CONFIG_ARM64_BL31_EXTERNAL_FILE),"")</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> BL31_SOURCE := $(top)/3rdparty/arm-trusted-firmware</span><br><span> BL31_BUILD := $(abspath $(obj)/3rdparty/arm-trusted-firmware)</span><br><span> BL31_TARGET := $(BL31_BUILD)/bl31/bl31.elf</span><br><span>@@ -205,6 +207,13 @@</span><br><span> </span><br><span> .PHONY: $(BL31)</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+else</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+BL31 := $(call strip_quotes,$(CONFIG_ARM64_BL31_EXTERNAL_FILE))</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+endif # CONFIG_ARM64_BUILD_ARM_TRUSTED_FIRMWARE</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> BL31_CBFS := $(CONFIG_CBFS_PREFIX)/bl31</span><br><span> $(BL31_CBFS)-file := $(BL31)</span><br><span> $(BL31_CBFS)-type := payload</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/27559">change 27559</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://review.coreboot.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://review.coreboot.org/27559"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: coreboot </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I17954247029df627a3f4db8b73993bd549e55967 </div>
<div style="display:none"> Gerrit-Change-Number: 27559 </div>
<div style="display:none"> Gerrit-PatchSet: 5 </div>
<div style="display:none"> Gerrit-Owner: Patrick Rudolph <patrick.rudolph@9elements.com> </div>
<div style="display:none"> Gerrit-Reviewer: David Hendricks <david.hendricks@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: Julius Werner <jwerner@chromium.org> </div>
<div style="display:none"> Gerrit-Reviewer: Patrick Rudolph <patrick.rudolph@9elements.com> </div>
<div style="display:none"> Gerrit-Reviewer: Paul Menzel <paulepanter@users.sourceforge.net> </div>
<div style="display:none"> Gerrit-Reviewer: Philipp Deppenwiese <zaolin.daisuki@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: T.Michael Turney <tturne@codeaurora.org> </div>
<div style="display:none"> Gerrit-Reviewer: build bot (Jenkins) <no-reply@coreboot.org> </div>