[coreboot-gerrit] Patch set updated for coreboot: soc/qualcomm/ipq40xx: Add rules to combine vendor binary and CB binaries

[Patrick Georgi (pgeorgi@google.com)]

Patrick Georgi (pgeorgi at google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/14651

-gerrit

commit aad6843b5dda6eefa4811e5fa20b29edb26034c0
Author: Varadarajan Narayanan <varada at codeaurora.org>
Date:   Wed Oct 21 15:56:32 2015 +0530

    soc/qualcomm/ipq40xx: Add rules to combine vendor binary and CB binaries
    
    BUG=chrome-os-partner:49249
    TEST=Compiles...
    BRANCH=none
    
    Change-Id: I8f29a6facb67dca5d61f349465f671e605e7646a
    Signed-off-by: Patrick Georgi <pgeorgi at chromium.org>
    Original-Commit-Id: d4b49d37c5b6f86a3bc360051904175111e1db2b
    Original-Change-Id: I85fde202213b47d5e7c9af3a8d920da20cf456fa
    Original-Signed-off-by: Varadarajan Narayanan <varada at codeaurora.org>
    Original-Reviewed-on: https://chromium-review.googlesource.com/333308
    Original-Commit-Ready: David Hendricks <dhendrix at chromium.org>
    Original-Tested-by: David Hendricks <dhendrix at chromium.org>
    Original-Reviewed-by: David Hendricks <dhendrix at chromium.org>
---
 src/soc/qualcomm/ipq40xx/Makefile.inc | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/src/soc/qualcomm/ipq40xx/Makefile.inc b/src/soc/qualcomm/ipq40xx/Makefile.inc
index e0cec00..a8d9b1b 100644
--- a/src/soc/qualcomm/ipq40xx/Makefile.inc
+++ b/src/soc/qualcomm/ipq40xx/Makefile.inc
@@ -52,18 +52,10 @@ 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