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@chromium.org>
Original-Commit-Id: a126a62f65a568d62fe35bdcf27eaec38fd1a997
Original-Change-Id: Iec3c1e943f1f9ee5ca20320a6365fc4aa5516e38
Original-Signed-off-by: Vadim Bendebury <vbendeb@chromium.org>
Original-Reviewed-on: https://chromium-review.googlesource.com/232310
Original-Reviewed-by: Manoj Juneja <mjuneja@qti.qualcomm.com>
Original-Reviewed-by: Trevor Bourget <tbourget@codeaurora.org>
Original-Reviewed-by: David Hendricks <dhendrix@chromium.org>
Reviewed-on: http://review.coreboot.org/9573
Tested-by: build bot (Jenkins)
Reviewed-by: Marc Jones <marc.jones@se-eng.com>
This commit is contained in:
Vadim Bendebury 2014-11-30 16:10:46 -08:00 committed by Stefan Reinauer
parent f3c50d4075
commit e39ac75491
2 changed files with 3 additions and 3 deletions

View File

@ -41,7 +41,7 @@ config MBN_ENCAPSULATION
config SBL_BLOB config SBL_BLOB
depends on USE_BLOBS depends on USE_BLOBS
string "file name of the Qualcomm SBL blob" string "file name of the Qualcomm SBL blob"
default "3rdparty/cpu/qualcomm/ipq8064/sbls.bin" default "3rdparty/cpu/qualcomm/ipq806x/uber-sbl.mbn"
help help
The path and filename of the binary blob containing The path and filename of the binary blob containing
ipq806x early initialization code, as supplied by the ipq806x early initialization code, as supplied by the

View File

@ -56,8 +56,8 @@ $(objcbfs)/bootblock.mbn: $(objcbfs)/bootblock.raw
# Create a complete bootblock which will start up the system # Create a complete bootblock which will start up the system
$(objcbfs)/bootblock.bin: $(call strip_quotes,$(CONFIG_SBL_BLOB)) \ $(objcbfs)/bootblock.bin: $(call strip_quotes,$(CONFIG_SBL_BLOB)) \
$(objcbfs)/bootblock.mbn $(objcbfs)/bootblock.mbn
@printf " CAT $(subst $(obj)/,,$(@))\n" @printf " MBNCAT $(subst $(obj)/,,$(@))\n"
@cat $^ > $@.tmp @util/ipqheader/mbncat.py -o $@.tmp $^
@mv $@.tmp $@ @mv $@.tmp $@
endif endif