diff options
| author | Vadim Bendebury <vbendeb@google.com> | 2017-08-02 11:35:25 -0700 |
|---|---|---|
| committer | ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> | 2017-08-18 20:07:27 +0000 |
| commit | 12e5b378d79f70d40b653e21f5d79ceb679efef1 (patch) | |
| tree | 87c6cbb7ef97ce974db451352aa8300d57ff7081 | |
| parent | 5a5c8596d00c670d2bf3648bce941447f40cfe9f (diff) | |
| download | chrome-ec-12e5b378d79f70d40b653e21f5d79ceb679efef1.tar.gz | |
g: stop converting hex device id values to ints
The new signer (version: 1.2 00840c1b6) allows hex values in the
manifest, which means there is no need to explicitly convert the
values before adding them to the manifest.
A nice side effect of this is the fact that there is no need to care
about the sign of the values any more, the signer does the right
thing.
Conflicts:
util/signer/bs
BRANCH=none
BUG=none
TEST=built an image using the following invocation:
$ make BOARD=cr50 H1_DEVIDS='0x12009015 0x90e95664' -j
and successfully ran it on a device. Note that the old signer was
chocking on hex values exceeding 0x7fffffff, the new one handles
them properly.
Change-Id: I08c0339f922d287c82d56fb51570bfbf7107531e
Signed-off-by: Vadim Bendebury <vbendeb@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/598728
Reviewed-by: Nick Sanders <nsanders@chromium.org>
(cherry picked from commit 5a9d0de240fd7e964f15e7f2cae33277fd57f046)
Reviewed-on: https://chromium-review.googlesource.com/618399
| -rw-r--r-- | chip/g/build.mk | 2 | ||||
| -rwxr-xr-x | util/signer/bs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/chip/g/build.mk b/chip/g/build.mk index c9584da190..2eef1fbf9c 100644 --- a/chip/g/build.mk +++ b/chip/g/build.mk @@ -164,7 +164,7 @@ else DUMMY := $(shell /bin/cp $(MANIFEST) $(SIGNER_MANIFEST)) endif REPLACEMENT := $(shell printf \ - '\\n \\"DEV_ID0\\": %d,\\n \\"DEV_ID1\\": %d,' $(H1_DEVIDS)) + '\\n \\"DEV_ID0\\": %s,\\n \\"DEV_ID1\\": %s,' $(H1_DEVIDS)) NODE_JSON := $(shell sed -i \ "s/\"fuses\": {/\"fuses\": {$(REPLACEMENT)/" $(SIGNER_MANIFEST)) diff --git a/util/signer/bs b/util/signer/bs index b97f26036a..41eb0d29d2 100755 --- a/util/signer/bs +++ b/util/signer/bs @@ -139,7 +139,7 @@ fi if [ -z "${do_prod}" -a -n "${H1_DEVIDS}" ]; then echo "creating a customized DEV image for DEV IDS ${H1_DEVIDS}" - sub=$(printf "\\\n \"DEV_ID0\": %d,\\\n \"DEV_ID1\": %d," ${H1_DEVIDS}) + sub=$(printf "\\\n \"DEV_ID0\": %s,\\\n \"DEV_ID1\": %s," ${H1_DEVIDS}) sed -i "s/\"fuses\": {/\"fuses\": {${sub}/" "${tmpf}" fi |