diff options
| author | Icarus Sparry <icarus.w.sparry@intel.com> | 2015-02-28 16:24:06 -0800 |
|---|---|---|
| committer | ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> | 2015-04-15 22:58:27 +0000 |
| commit | 4fce69d39497d5f20e7429b6675e5361b9922f0a (patch) | |
| tree | b62f5dcce8e82fb5c2fbc66869e9c074b9f43ada /chip | |
| parent | 6ab1f5b703ed76195f12df67fd0af6aa37ee9473 (diff) | |
| download | chrome-ec-4fce69d39497d5f20e7429b6675e5361b9922f0a.tar.gz | |
mec1322: Changed to generate ec.bin for the firmware binary.
Previously for the mec1322 chip an ec.bin file was created in the normal way
and then it was "packed" in a post-processing stage to produce ec.spi.bin.
This change allows a chip or board build.mk file to specify the rules used to
produce ec.bin, and uses this for the mec1322 to do the packing. This means
that we can use the standard "ec.bin" name, and do not need to alter other
scripts, such as the script which creates chromeos-firmwareupdate.
BUG=None
TEST=buildall -j, flash on strago and see it still works.
BRANCH=NONE
Change-Id: I3f880d64e60d14f82cb1d21c8b3f2d4ae5e0dfef
Signed-off-by: Icarus Sparry <icarus.w.sparry@intel.com>
Reviewed-on: https://chromium-review.googlesource.com/265544
Tested-by: Kevin K Wong <kevin.k.wong@intel.com>
Reviewed-by: Randall Spangler <rspangler@chromium.org>
Commit-Queue: Kevin K Wong <kevin.k.wong@intel.com>
Diffstat (limited to 'chip')
| -rw-r--r-- | chip/mec1322/build.mk | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/chip/mec1322/build.mk b/chip/mec1322/build.mk index 9c9ecd16b5..8e137b336b 100644 --- a/chip/mec1322/build.mk +++ b/chip/mec1322/build.mk @@ -27,8 +27,12 @@ chip-$(CONFIG_SPI)+=spi.o # location of the scripts and keys used to pack the SPI flash image SCRIPTDIR:=./chip/${CHIP}/util -# commands to package something -cmd_pack_package = ${SCRIPTDIR}/pack_ec.py -o $@ -i $^ \ - --payload_key ${SCRIPTDIR}/rsakey_sign_payload.pem \ - --header_key ${SCRIPTDIR}/rsakey_sign_header.pem \ - --spi_size ${CHIP_SPI_SIZE_KB} +# Allow SPI size to be overridden by board specific size, default to 256KB. +CHIP_SPI_SIZE_KB?=256 + +# Commands to convert $^ to $@.tmp +cmd_obj_to_bin = $(OBJCOPY) --gap-fill=0xff -O binary $^ $@.tmp1 ; \ + ${SCRIPTDIR}/pack_ec.py -o $@.tmp -i $@.tmp1 \ + --payload_key ${SCRIPTDIR}/rsakey_sign_payload.pem \ + --header_key ${SCRIPTDIR}/rsakey_sign_header.pem \ + --spi_size ${CHIP_SPI_SIZE_KB} ; rm -f $@.tmp1 |