[coreboot-gerrit] Patch set updated for coreboot: 8225618 ipq8064: use the new utility to build bootblock

[Patrick Georgi (pgeorgi@google.com)]

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

-gerrit

commit 8225618aa11f59a50217cd4a420d0ad5ef409009
Author: Vadim Bendebury <vbendeb at chromium.org>
Date:   Sun Nov 30 16:10:46 2014 -0800

    ipq8064: use the new utility to build bootblock
    
    The first blob in the Storm bootimage is a concatenation of the
    Uber-sbl produced by the qca-firmware ebuild and the coreboot
    bootblock.
    
    The new tool is used to add the bootblock to uber-sbl and update the
    size values in the combined header.
    
    BRANCH=storm
    BUG=chrome-os-partner:34161
    TEST=no execution tests yet, the build succeeds.
    
    Change-Id: I4f1fe8a97ffab04eee4f82bc43e6f5406dd9bb42
    Signed-off-by: Stefan Reinauer <reinauer at chromium.org>
    Original-Commit-Id: a126a62f65a568d62fe35bdcf27eaec38fd1a997
    Original-Change-Id: Iec3c1e943f1f9ee5ca20320a6365fc4aa5516e38
    Original-Signed-off-by: Vadim Bendebury <vbendeb at chromium.org>
    Original-Reviewed-on: https://chromium-review.googlesource.com/232310
    Original-Reviewed-by: Manoj Juneja <mjuneja at qti.qualcomm.com>
    Original-Reviewed-by: Trevor Bourget <tbourget at codeaurora.org>
    Original-Reviewed-by: David Hendricks <dhendrix at chromium.org>
---
 3rdparty                              | 2 +-
 src/soc/qualcomm/ipq806x/Kconfig      | 2 +-
 src/soc/qualcomm/ipq806x/Makefile.inc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/3rdparty b/3rdparty
index 2bc495f..49f2698 160000
--- a/3rdparty
+++ b/3rdparty
@@ -1 +1 @@
-Subproject commit 2bc495fd31107ffe4661811dcfe4349809d8f1a2
+Subproject commit 49f26985f6106a925ca824927699a357dce62854
diff --git a/src/soc/qualcomm/ipq806x/Kconfig b/src/soc/qualcomm/ipq806x/Kconfig
index 8cc7233..0136a18 100644
--- a/src/soc/qualcomm/ipq806x/Kconfig
+++ b/src/soc/qualcomm/ipq806x/Kconfig
@@ -41,7 +41,7 @@ config MBN_ENCAPSULATION
 config SBL_BLOB
 	depends on USE_BLOBS
 	string "file name of the Qualcomm SBL blob"
-	default "3rdparty/cpu/qualcomm/ipq8064/sbls.bin"
+	default "3rdparty/cpu/qualcomm/ipq806x/uber-sbl.mbn"
 	help
 	  The path and filename of the binary blob containing
 	  ipq806x early initialization code, as supplied by the
diff --git a/src/soc/qualcomm/ipq806x/Makefile.inc b/src/soc/qualcomm/ipq806x/Makefile.inc
index 5dfca4d..27967dc 100644
--- a/src/soc/qualcomm/ipq806x/Makefile.inc
+++ b/src/soc/qualcomm/ipq806x/Makefile.inc
@@ -57,8 +57,8 @@ $(objcbfs)/bootblock.mbn: $(objcbfs)/bootblock.raw
 # Create a complete bootblock which will start up the system
 $(objcbfs)/bootblock.bin: $(call strip_quotes,$(CONFIG_SBL_BLOB)) \
 			   $(objcbfs)/bootblock.mbn
-	@printf "    CAT    $(subst $(obj)/,,$(@))\n"
-	@cat $^  >  $@.tmp
+	@printf "    MBNCAT     $(subst $(obj)/,,$(@))\n"
+	@util/ipqheader/mbncat.py -o $@.tmp $^
 	@mv $@.tmp $@
 
 endif