summaryrefslogtreecommitdiff
path: root/src/soc
diff options
context:
space:
mode:
Diffstat (limited to 'src/soc')
-rw-r--r--src/soc/qualcomm/ipq40xx/Kconfig19
-rw-r--r--src/soc/qualcomm/ipq40xx/Makefile.inc18
2 files changed, 20 insertions, 17 deletions
diff --git a/src/soc/qualcomm/ipq40xx/Kconfig b/src/soc/qualcomm/ipq40xx/Kconfig
index a122ac9eb2..86db09b8e5 100644
--- a/src/soc/qualcomm/ipq40xx/Kconfig
+++ b/src/soc/qualcomm/ipq40xx/Kconfig
@@ -22,13 +22,24 @@ config MBN_ENCAPSULATION
bool "bootblock encapsulation for ipq40xx"
default y
-config SBL_BLOB
+config CDT_MBN
+ string "CDT binary blob"
+ default "cdt-AP.DK01.1-C1.bin"
+
+config DDR_MBN
+ string "DDR driver binary blob"
+ default "ddr.mbn"
+
+config TZ_MBN
+ string "TZ binary blob"
+ default "tzbsp_no_xpu.mbn"
+
+config SBL_ELF
depends on USE_BLOBS
- string "file name of the Qualcomm SBL blob"
- default "3rdparty/blobs/cpu/qualcomm/ipq40xx/uber-sbl.mbn"
+ string "file name of the QCA SBL ELF"
+ default "3rdparty/blobs/cpu/qualcomm/ipq40xx/sbl.elf"
help
The path and filename of the binary blob containing
ipq40xx early initialization code, as supplied by the
vendor.
-
endif
diff --git a/src/soc/qualcomm/ipq40xx/Makefile.inc b/src/soc/qualcomm/ipq40xx/Makefile.inc
index 95a78b3ce9..a8d9b1bcc2 100644
--- a/src/soc/qualcomm/ipq40xx/Makefile.inc
+++ b/src/soc/qualcomm/ipq40xx/Makefile.inc
@@ -52,25 +52,17 @@ ramstage-y += tz_wrapper.S
ifeq ($(CONFIG_USE_BLOBS),y)
-# Add MBN header to allow SBL3 to start coreboot bootblock
-$(objcbfs)/bootblock.mbn: $(objcbfs)/bootblock.raw.bin
- @printf " ADD MBN $(subst $(obj)/,,$(@))\n"
- ./util/ipqheader/ipqheader.py $(call loadaddr,bootblock) $< $@.tmp
- @mv $@.tmp $@
-
-# Create a complete bootblock which will start up the system
-$(objcbfs)/bootblock.bin: $(call strip_quotes,$(CONFIG_SBL_BLOB)) \
- $(objcbfs)/bootblock.mbn
- @printf " MBNCAT $(subst $(obj)/,,$(@))\n"
- @util/ipqheader/mbncat.py -o $@.tmp $^
- @mv $@.tmp $@
+$(objcbfs)/bootblock.bin: $(call strip_quotes,$(CONFIG_SBL_ELF)) \
+ $(objcbfs)/bootblock.elf
+ @printf " CRXBL $(subst $(obj)/,,$(^)) $(subst $(obj)/,,$(@))\n"
+ @util/ipqheader/createxbl.py -f $(CONFIG_SBL_ELF) -s $(objcbfs)/bootblock.elf -o $@ -a 32 -b 32
endif
CPPFLAGS_common += -Isrc/soc/qualcomm/ipq40xx/include
# List of binary blobs coreboot needs in CBFS to be able to boot up this SOC
-mbn-files := cdt.mbn ddr.mbn rpm.mbn tz.mbn
+mbn-files := $(CONFIG_CDT_MBN) $(CONFIG_DDR_MBN) $(CONFIG_TZ_MBN)
# Location of the binary blobs
mbn-root := 3rdparty/blobs/cpu/qualcomm/ipq40xx