[coreboot-gerrit] Change in coreboot[master]: HACK: Julius' changes for v18

[Julius Werner (Code Review)]

Julius Werner has uploaded this change for review. ( https://review.coreboot.org/29521


Change subject: HACK: Julius' changes for v18
......................................................................

HACK: Julius' changes for v18

Change-Id: Ie8c222c152b2f6925c6c5a391a2c7b51e36d54df
Signed-off-by: Julius Werner <jwerner at chromium.org>
---
M src/arch/arm64/Makefile.inc
M src/soc/qualcomm/sdm845/Makefile.inc
2 files changed, 0 insertions(+), 15 deletions(-)



  git pull ssh://review.coreboot.org:29418/coreboot refs/changes/21/29521/1

diff --git a/src/arch/arm64/Makefile.inc b/src/arch/arm64/Makefile.inc
index 5f8b092..6bb7196 100644
--- a/src/arch/arm64/Makefile.inc
+++ b/src/arch/arm64/Makefile.inc
@@ -156,8 +156,6 @@
 # Build ARM Trusted Firmware (BL31)
 
 ifeq ($(CONFIG_ARM64_USE_ARM_TRUSTED_FIRMWARE),y)
-# temporary change, soc makefile process would pack pre-built bl31
-ifneq ($(CONFIG_SOC_QUALCOMM_SDM845),y)
 
 ifeq ($(CONFIG_ARM64_BL31_EXTERNAL_FILE),"")
 
@@ -237,8 +235,6 @@
 
 endif # CONFIG_ARM64_USE_SECURE_OS
 
-endif # CONFIG_SOC_QUALCOMM_845
-
 endif # CONFIG_ARM64_USE_ARM_TRUSTED_FIRMWARE
 
 endif # CONFIG_ARCH_RAMSTAGE_ARM64
diff --git a/src/soc/qualcomm/sdm845/Makefile.inc b/src/soc/qualcomm/sdm845/Makefile.inc
index 711c62d..6249040 100644
--- a/src/soc/qualcomm/sdm845/Makefile.inc
+++ b/src/soc/qualcomm/sdm845/Makefile.inc
@@ -166,17 +166,6 @@
 endif
 
 ################################################################################
-BL31_FILE := $(SDM845_BLOB)/bl31.elf
-bl31_file := $(shell ls $(BL31_FILE))
-ifneq (,$(findstring $(BL31_FILE),$(bl31_file)))
-	BL31_CBFS := $(CONFIG_CBFS_PREFIX)/bl31
-	$(BL31_CBFS)-file := $(BL31_FILE)
-	$(BL31_CBFS)-type := payload
-	$(BL31_CBFS)-compression := none
-	cbfs-files-y += $(BL31_CBFS)
-endif
-
-################################################################################
 QC_SEC_FILE := $(SDM845_BLOB)/qc_sec.mbn
 qc_sec_file := $(shell ls $(QC_SEC_FILE))
 ifneq (,$(findstring $(QC_SEC_FILE),$(qc_sec_file)))

-- 
To view, visit https://review.coreboot.org/29521
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie8c222c152b2f6925c6c5a391a2c7b51e36d54df
Gerrit-Change-Number: 29521
Gerrit-PatchSet: 1
Gerrit-Owner: Julius Werner <jwerner at chromium.org>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.coreboot.org/pipermail/coreboot-gerrit/attachments/20181107/94c8046c/attachment-0001.html>