summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVadim Bendebury <vbendeb@chromium.org>2016-02-26 17:00:50 -0800
committerchrome-bot <chrome-bot@chromium.org>2016-02-27 03:25:52 -0800
commitb6f3e288c175fa6720cb9d67c0935acad3c577bf (patch)
tree7c3fad9058bb12c3fa9160a1b1a259d2224c63d6
parentd1bf3aecfafcfc82cd7ff0233b6487f11b11c114 (diff)
downloadchrome-ec-b6f3e288c175fa6720cb9d67c0935acad3c577bf.tar.gz
cr50: use the correct signer invocation options
The new signer command line option should be used by some boards, not all of them. Add it for cr50 for now. BRANCH=none BUG=none TEST=verified that --cros is added to the command line when cr50 blobs are signed, and that the signed blob boots fine on b1. Change-Id: Ibc38cc6233b57838129ae7d554921c1bae0e6b8c Signed-off-by: Vadim Bendebury <vbendeb@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/329595 Reviewed-by: Bill Richardson <wfrichar@chromium.org>
-rw-r--r--Makefile.rules2
-rw-r--r--board/cr50/build.mk1
2 files changed, 2 insertions, 1 deletions
diff --git a/Makefile.rules b/Makefile.rules
index 050d932e81..8e341e2585 100644
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -42,7 +42,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 ?= sudo $(out)/util/signer --key=util/signer/$(3) \
- --input=$< --format=bin --output=$@.signed \
+ --input=$< --format=bin --output=$@.signed $(SIG_EXTRA) \
&& sudo chown $(shell whoami) $@.signed && mv $@.signed $@
cmd_elf_to_dis = $(OBJDUMP) -D $< > $@
cmd_elf_to_hex = $(OBJCOPY) -O ihex $< $@
diff --git a/board/cr50/build.mk b/board/cr50/build.mk
index 2fe51066f9..3a1c734afc 100644
--- a/board/cr50/build.mk
+++ b/board/cr50/build.mk
@@ -16,6 +16,7 @@ CHIP_VARIANT ?= cr50_fpga
# second time.
ifeq ($(BOARD_MK_INCLUDED_ONCE),)
BOARD_MK_INCLUDED_ONCE=1
+SIG_EXTRA = --cros
else
# Need to generate a .hex file