Ravi kumar has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/47905 )
Change subject: HACK herobrine: prevent system from building bl31 HACK ......................................................................
HACK herobrine: prevent system from building bl31 HACK
Signed-off-by: Ravi Kumar Bokka rbokka@codeaurora.org Change-Id: I3fe63b8cc1afe3ad8cf334b74f0847369f32c8db --- M src/arch/arm64/Makefile.inc M src/soc/qualcomm/sc7280/Makefile.inc 2 files changed, 11 insertions(+), 0 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/05/47905/1
diff --git a/src/arch/arm64/Makefile.inc b/src/arch/arm64/Makefile.inc index 44517cb..146d104 100644 --- a/src/arch/arm64/Makefile.inc +++ b/src/arch/arm64/Makefile.inc @@ -140,6 +140,7 @@ # Build ARM Trusted Firmware (BL31)
ifeq ($(CONFIG_ARM64_USE_ARM_TRUSTED_FIRMWARE),y) +ifneq ($(CONFIG_SOC_QUALCOMM_SC7280),y)
ifeq ($(CONFIG_ARM64_BL31_EXTERNAL_FILE),"")
@@ -216,6 +217,8 @@
endif # CONFIG_ARM64_USE_SECURE_OS
+endif #CONFIG_SOC_QUALCOMM_SC7280 + endif # CONFIG_ARM64_USE_ARM_TRUSTED_FIRMWARE
endif # CONFIG_ARCH_RAMSTAGE_ARM64 diff --git a/src/soc/qualcomm/sc7280/Makefile.inc b/src/soc/qualcomm/sc7280/Makefile.inc index acbb36d..399d6ef 100644 --- a/src/soc/qualcomm/sc7280/Makefile.inc +++ b/src/soc/qualcomm/sc7280/Makefile.inc @@ -69,6 +69,14 @@ $(objcbfs)/bootblock.bin
################################################################################ +BL31_FILE := $(SC7280_BLOB)/qtiseclib/bl31.elf +BL31_CBFS := $(CONFIG_CBFS_PREFIX)/bl31 +$(BL31_CBFS)-file := $(BL31_FILE) +$(BL31_CBFS)-type := payload +$(BL31_CBFS)-compression := none +cbfs-files-y += $(BL31_CBFS) + +################################################################################ UART_FW_FILE := $(SC7280_BLOB)/qup_fw/uart_fw.bin UART_FW_CBFS := $(CONFIG_CBFS_PREFIX)/uart_fw $(UART_FW_CBFS)-file := $(UART_FW_FILE)