diff options
| author | Vadim Bendebury <vbendeb@chromium.org> | 2017-08-07 11:34:57 -0700 |
|---|---|---|
| committer | ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> | 2017-08-19 00:32:04 +0000 |
| commit | e94cdce6d04fc8e392ab63c151aa6de04799a52c (patch) | |
| tree | 6de0406646d3b62a60c18ce9c82257f2008dbcaf | |
| parent | 2dbe374408993d1f2a03ec56aa09e3de81436f1e (diff) | |
| download | chrome-ec-e94cdce6d04fc8e392ab63c151aa6de04799a52c.tar.gz | |
g: signer: unify order of board ID fields
The board ID fields are displayed by the Cr50 console command 'bid' as
follows: <board id>:<board id mask>:<board id flags>.
Make sure the user passes them in the same order when invoking the signer
to sign a board locked image.
BRANCH=none
BUG=none
TEST=verified proper order of the fields when generating and using a
prod signed image.
Change-Id: Ia4569c5e9e663b26edaa591bae881c719c4f199c
Signed-off-by: Vadim Bendebury <vbendeb@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/604218
Reviewed-by: Mary Ruthven <mruthven@chromium.org>
(cherry picked from commit 1573f257b7afa59d2749ee3a2a19caa0a8b22d76)
Reviewed-on: https://chromium-review.googlesource.com/622349
| -rwxr-xr-x | util/signer/bs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/util/signer/bs b/util/signer/bs index 1d7292a9a9..8815e97d29 100755 --- a/util/signer/bs +++ b/util/signer/bs @@ -58,7 +58,7 @@ required to include three colon separated fields. The first field is a four letter board RLZ code, the second field is board id mask in hex, no 0x prefix, and the third field - board ID flags, again, hex, no 0x prefix. -CR50_BOARD_ID='XXYY:12:13' ${progname} [other options, if any] +CR50_BOARD_ID='XXYY:ffffff00:ff00' ${progname} [other options, if any] both H1_DEVIDS and CR50_BOARD_ID can be defined independently. @@ -100,8 +100,8 @@ tweak_manifest () { # Prepare text of all three board ID related nodes sub="$(printf "\\\n\"board_id\": %s,\\\n" "${rlz}")" - sub+="$(printf "\"board_id_flags\": %s,\\\n" "0x${bid_params[1]}")" - sub+="$(printf "\"board_id_mask\": %s,\\\n" "0x${bid_params[2]}")" + sub+="$(printf "\"board_id_mask\": %s,\\\n" "0x${bid_params[1]}")" + sub+="$(printf "\"board_id_flags\": %s,\\\n" "0x${bid_params[2]}")" sed -i "s/\"fuses\": {/${sub}\"fuses\": {/" "${tmpf}" } |