diff options
| author | Vadim Bendebury <vbendeb@chromium.org> | 2018-09-21 17:33:47 -0700 |
|---|---|---|
| committer | ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> | 2018-09-24 00:00:38 +0000 |
| commit | a1b6becaa818f368f90e9a8b593b3e6cc704564e (patch) | |
| tree | c21b5a6d85829645206496a84ee0adf22ca2cdc1 | |
| parent | 65c59b7b1d7ecf82b8fcebf8348235bf715718b9 (diff) | |
| download | chrome-ec-1.9308_26_0.0.22.tar.gz | |
g: support building with dummy signerv1.9308_26_0.0.22
When the image is built on the build server, the cr50-signer is not
available, as the infrastructure required to bring it in does not
exist in this branch.
Note that only board locked RW would require using the real signer,
the release images are signed using ToT, so instead of going through
the trouble of incorporating cr50-utils with all its dependencies into
the cr50-guc-factory-9308.26.B branch let's just have the default
build (ran on the build server) use the local dummy signer, as it did
before, but allow the user to override the signer when producing a
node locked image is required.
BRANCH=none
BUG=none
TEST=verified that both of the following commands succeed:
emerge-reef chromeos-ec
make SIGNER=/usr/bin/cr50-codesigner BOARD=cr50 H1_DEVIDS='xx yy' -j
Change-Id: Ida85ac5ffb12ed4895c898f6939909492dc1fcd9
Signed-off-by: Vadim Bendebury <vbendeb@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/1239716
Reviewed-by: Randall Spangler <rspangler@chromium.org>
| -rw-r--r-- | Makefile.rules | 2 | ||||
| -rw-r--r-- | chip/g/build.mk | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Makefile.rules b/Makefile.rules index 7e97db98e3..cfdef95133 100644 --- a/Makefile.rules +++ b/Makefile.rules @@ -61,7 +61,7 @@ cmd_flat_to_obj = $(CC) -T $(out)/firmware_image.lds -nostdlib $(CPPFLAGS) \ cmd_ec_elf_to_flat ?= $(OBJCOPY) --set-section-flags .roshared=share \ -O binary $< $@ cmd_elf_to_signed ?= $(SIGNER) --key=util/signer/$(3) \ - --input=$< --format=bin --output=$@.signed --b $(SIGNER_EXTRAS) \ + --input=$< --format=bin --output=$@.signed $(SIGNER_EXTRAS) \ && sudo chown $(shell whoami) $@.signed && mv $@.signed $@ cmd_elf_to_dis = $(OBJDUMP) -D $< > $@ cmd_elf_to_hex = $(OBJCOPY) -O ihex $< $@ diff --git a/chip/g/build.mk b/chip/g/build.mk index 8ecb5b4792..9467a3d618 100644 --- a/chip/g/build.mk +++ b/chip/g/build.mk @@ -121,14 +121,14 @@ endif MANIFEST := util/signer/ec_RW-manifest-dev.json CR50_RO_KEY ?= rom-testkey-A.pem -SIGNER = /usr/bin/cr50-codesigner +SIGNER ?= $(out)/util/signer ifeq ($(H1_DEVIDS),) CR50_RW_KEY = loader-testkey-A.pem SIGNER_EXTRAS = SIGNER_MANIFEST := $(MANIFEST) else CR50_RW_KEY = cr50_rom0-dev-blsign.pem.pub -RW_SIGNER_EXTRAS = -x util/signer/fuses.xml +RW_SIGNER_EXTRAS = -x util/signer/fuses.xml --b ifneq ($(CHIP_MK_INCLUDED_ONCE),) # |