[coreboot-gerrit] Change in ...coreboot[master]: TEMP: NOT FOR REVIEW qcs405: Enable bl31

[Name of user not set (Code Review)]

[e-mail] has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/31899

Change subject: TEMP: NOT FOR REVIEW qcs405: Enable bl31
......................................................................

TEMP: NOT FOR REVIEW qcs405: Enable bl31

Keeping it seperate to include bl31.elf till
we can build bl31 from repo

Change-Id: Icca865369358e54a042b2dce02072c05761194b2
Signed-off-by: Nitheesh Sekar 
Signed-off-by: Sricharan R 
---
M src/arch/arm64/Makefile.inc
M src/soc/qualcomm/qcs405/Makefile.inc
M src/soc/qualcomm/qcs405/soc.c
3 files changed, 16 insertions(+), 1 deletion(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/99/31899/1

diff --git a/src/arch/arm64/Makefile.inc b/src/arch/arm64/Makefile.inc
index 6bb7196..bf2f01b 100644
--- a/src/arch/arm64/Makefile.inc
+++ b/src/arch/arm64/Makefile.inc
@@ -157,6 +157,8 @@

ifeq ($(CONFIG_ARM64_USE_ARM_TRUSTED_FIRMWARE),y)

+ifneq ($(CONFIG_SOC_QUALCOMM_QCS405),y)
+
 ifeq ($(CONFIG_ARM64_BL31_EXTERNAL_FILE),"")

BL31_SOURCE := $(top)/3rdparty/arm-trusted-firmware
@@ -235,6 +237,8 @@

endif # CONFIG_ARM64_USE_SECURE_OS

+endif # CONFIG_SOC_QUALCOMM_QCS405
+
 endif # CONFIG_ARM64_USE_ARM_TRUSTED_FIRMWARE

endif # CONFIG_ARCH_RAMSTAGE_ARM64
diff --git a/src/soc/qualcomm/qcs405/Makefile.inc b/src/soc/qualcomm/qcs405/Makefile.inc
index 8c57f4a..b6ad8c2 100644
--- a/src/soc/qualcomm/qcs405/Makefile.inc
+++ b/src/soc/qualcomm/qcs405/Makefile.inc
@@ -107,4 +107,15 @@
    @printf "Generating: $(subst $(obj)/,,$(@))\n"
    cp $(objcbfs)/bootblock.raw.bin $(objcbfs)/bootblock.bin
 endif
+################################################################################
+BL31_FILE := $(QCS405_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
+################################################################################
 endif
diff --git a/src/soc/qualcomm/qcs405/soc.c b/src/soc/qualcomm/qcs405/soc.c
index ea52eb8..e22a3d8 100644
--- a/src/soc/qualcomm/qcs405/soc.c
+++ b/src/soc/qualcomm/qcs405/soc.c
@@ -23,7 +23,7 @@

void bootmem_platform_add_ranges(void)
 {
-	bootmem_add_range((uintptr_t)_dram_reserved, _dram_reserved_size, BM_MEM_BL31);
+	bootmem_add_range((uintptr_t)_dram_reserved, REGION_SIZE(dram_reserved), BM_MEM_BL31);
 }

static void soc_read_resources(struct device *dev)