From a126a62f65a568d62fe35bdcf27eaec38fd1a997 Mon Sep 17 00:00:00 2001 From: Vadim Bendebury Date: Sun, 30 Nov 2014 16:10:46 -0800 Subject: [PATCH] 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: Iec3c1e943f1f9ee5ca20320a6365fc4aa5516e38 Signed-off-by: Vadim Bendebury Reviewed-on: https://chromium-review.googlesource.com/232310 Reviewed-by: Manoj Juneja Reviewed-by: Trevor Bourget Reviewed-by: David Hendricks --- src/soc/qualcomm/ipq806x/Kconfig | 2 +- src/soc/qualcomm/ipq806x/Makefile.inc | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/soc/qualcomm/ipq806x/Kconfig b/src/soc/qualcomm/ipq806x/Kconfig index f0ae7b85b5..a5b6ef9c4f 100644 --- a/src/soc/qualcomm/ipq806x/Kconfig +++ b/src/soc/qualcomm/ipq806x/Kconfig @@ -21,7 +21,7 @@ config MBN_ENCAPSULATION config SBL_BLOB depends on USE_BLOBS string "file name of the Qualcomm SBL blob" - default "3rdparty/cpu/qualcomm/ipq806x/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 f4a31657cc..830a6de474 100644 --- a/src/soc/qualcomm/ipq806x/Makefile.inc +++ b/src/soc/qualcomm/ipq806x/Makefile.inc @@ -59,8 +59,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