diff options
-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),) # |