From 1573f257b7afa59d2749ee3a2a19caa0a8b22d76 Mon Sep 17 00:00:00 2001 From: Vadim Bendebury Date: Mon, 7 Aug 2017 11:34:57 -0700 Subject: [PATCH] g: signer: unify order of board ID fields The board ID fields are displayed by the Cr50 console command 'bid' as follows: ::. 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 Reviewed-on: https://chromium-review.googlesource.com/604218 Reviewed-by: Mary Ruthven --- util/signer/bs | 6 +++--- 1 file 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}" }