<p>Julius Werner has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/29521">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">HACK: Julius' changes for v18<br><br>Change-Id: Ie8c222c152b2f6925c6c5a391a2c7b51e36d54df<br>Signed-off-by: Julius Werner <jwerner@chromium.org><br>---<br>M src/arch/arm64/Makefile.inc<br>M src/soc/qualcomm/sdm845/Makefile.inc<br>2 files changed, 0 insertions(+), 15 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/21/29521/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/arch/arm64/Makefile.inc b/src/arch/arm64/Makefile.inc</span><br><span>index 5f8b092..6bb7196 100644</span><br><span>--- a/src/arch/arm64/Makefile.inc</span><br><span>+++ b/src/arch/arm64/Makefile.inc</span><br><span>@@ -156,8 +156,6 @@</span><br><span> # Build ARM Trusted Firmware (BL31)</span><br><span> </span><br><span> ifeq ($(CONFIG_ARM64_USE_ARM_TRUSTED_FIRMWARE),y)</span><br><span style="color: hsl(0, 100%, 40%);">-# temporary change, soc makefile process would pack pre-built bl31</span><br><span style="color: hsl(0, 100%, 40%);">-ifneq ($(CONFIG_SOC_QUALCOMM_SDM845),y)</span><br><span> </span><br><span> ifeq ($(CONFIG_ARM64_BL31_EXTERNAL_FILE),"")</span><br><span> </span><br><span>@@ -237,8 +235,6 @@</span><br><span> </span><br><span> endif # CONFIG_ARM64_USE_SECURE_OS</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-endif # CONFIG_SOC_QUALCOMM_845</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> endif # CONFIG_ARM64_USE_ARM_TRUSTED_FIRMWARE</span><br><span> </span><br><span> endif # CONFIG_ARCH_RAMSTAGE_ARM64</span><br><span>diff --git a/src/soc/qualcomm/sdm845/Makefile.inc b/src/soc/qualcomm/sdm845/Makefile.inc</span><br><span>index 711c62d..6249040 100644</span><br><span>--- a/src/soc/qualcomm/sdm845/Makefile.inc</span><br><span>+++ b/src/soc/qualcomm/sdm845/Makefile.inc</span><br><span>@@ -166,17 +166,6 @@</span><br><span> endif</span><br><span> </span><br><span> ################################################################################</span><br><span style="color: hsl(0, 100%, 40%);">-BL31_FILE := $(SDM845_BLOB)/bl31.elf</span><br><span style="color: hsl(0, 100%, 40%);">-bl31_file := $(shell ls $(BL31_FILE))</span><br><span style="color: hsl(0, 100%, 40%);">-ifneq (,$(findstring $(BL31_FILE),$(bl31_file)))</span><br><span style="color: hsl(0, 100%, 40%);">- BL31_CBFS := $(CONFIG_CBFS_PREFIX)/bl31</span><br><span style="color: hsl(0, 100%, 40%);">- $(BL31_CBFS)-file := $(BL31_FILE)</span><br><span style="color: hsl(0, 100%, 40%);">-       $(BL31_CBFS)-type := payload</span><br><span style="color: hsl(0, 100%, 40%);">-    $(BL31_CBFS)-compression := none</span><br><span style="color: hsl(0, 100%, 40%);">-        cbfs-files-y += $(BL31_CBFS)</span><br><span style="color: hsl(0, 100%, 40%);">-endif</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-################################################################################</span><br><span> QC_SEC_FILE := $(SDM845_BLOB)/qc_sec.mbn</span><br><span> qc_sec_file := $(shell ls $(QC_SEC_FILE))</span><br><span> ifneq (,$(findstring $(QC_SEC_FILE),$(qc_sec_file)))</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/29521">change 29521</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/29521"/><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: newchange </div>
<div style="display:none"> Gerrit-Change-Id: Ie8c222c152b2f6925c6c5a391a2c7b51e36d54df </div>
<div style="display:none"> Gerrit-Change-Number: 29521 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Julius Werner <jwerner@chromium.org> </div>