summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMary Ruthven <mruthven@chromium.org>2021-05-03 15:01:39 -0500
committerCommit Bot <commit-bot@chromium.org>2021-05-04 02:25:58 +0000
commit7189f6992f5ca7ffd22775e8f73bb1e1cde24bbf (patch)
treef8e1fe695dbf53b46c8a051a27aeea84610d3b7b
parent733b9bfcf1eedecbbb18174b39e4c4fa47cff69b (diff)
downloadchrome-ec-7189f6992f5ca7ffd22775e8f73bb1e1cde24bbf.tar.gz
signer: advance version and erase new bit in rollback map
BUG=b:187081660 TEST=flashing the image erases the third rollback mask bit [0.049072 update_rollback_mask: bailing out at bit 0] [0.051795 update_rollback_mask: bailing out at bit 3] [0.052886 updated 1 info map words] > sysinfo ... Rollback: 0/0/1 3/3/3 ... Change-Id: Id802e3e4b010fbc7274e34360beaa47adcd0816f Signed-off-by: Mary Ruthven <mruthven@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2869128 Reviewed-by: Andrey Pronin <apronin@chromium.org>
-rw-r--r--util/signer/ec_RW-manifest-dev.json4
-rw-r--r--util/signer/ec_RW-manifest-prod.json4
2 files changed, 4 insertions, 4 deletions
diff --git a/util/signer/ec_RW-manifest-dev.json b/util/signer/ec_RW-manifest-dev.json
index c6dc3eb883..f2c6d79817 100644
--- a/util/signer/ec_RW-manifest-dev.json
+++ b/util/signer/ec_RW-manifest-dev.json
@@ -7,7 +7,7 @@
},
// Rollback state.
"info": {
- "2": -1, "3": -1, "4": -1, "5": -1, "6": -1,
+ "3": -1, "4": -1, "5": -1, "6": -1,
"7": -1, "8": -1, "9": -1, "10": -1, "11": -1, "12": -1 , "13": -1,
"14": -1, "15": -1, "16": -1, "17": -1, "18": -1, "19": -1, "20": -1,
"21": -1, "22": -1, "23": -1, "24": -1, "25": -1, "26": -1, "27": -1,
@@ -40,7 +40,7 @@
"timestamp": 0,
"epoch": 0, // FWR diversification contributor, 32 bits.
"major": 6, // FW2_HIK_CHAIN counter.
- "minor": 10, // Mostly harmless version field.
+ "minor": 11, // Mostly harmless version field.
"applysec": -1, // Mask to and with fuse BROM_APPLYSEC.
"config1": 13, // Which BROM_CONFIG1 actions to take before launching.
"err_response": 0, // Mask to or with fuse BROM_ERR_RESPONSE.
diff --git a/util/signer/ec_RW-manifest-prod.json b/util/signer/ec_RW-manifest-prod.json
index 5088429556..725e10c617 100644
--- a/util/signer/ec_RW-manifest-prod.json
+++ b/util/signer/ec_RW-manifest-prod.json
@@ -7,7 +7,7 @@
},
// Rollback state.
"info": {
- "2": -1, "3": -1, "4": -1, "5": -1, "6": -1,
+ "3": -1, "4": -1, "5": -1, "6": -1,
"7": -1, "8": -1, "9": -1, "10": -1, "11": -1, "12": -1 , "13": -1,
"14": -1, "15": -1, "16": -1, "17": -1, "18": -1, "19": -1, "20": -1,
"21": -1, "22": -1, "23": -1, "24": -1, "25": -1, "26": -1, "27": -1,
@@ -44,7 +44,7 @@
"timestamp": 1,
"epoch": 0, // FWR diversification contributor, 32 bits.
"major": 5, // FW2_HIK_CHAIN counter.
- "minor": 10, // Mostly harmless version field.
+ "minor": 11, // Mostly harmless version field.
"applysec": -1, // Mask to and with fuse BROM_APPLYSEC.
"config1": 13, // Which BROM_CONFIG1 actions to take before launching.
"err_response": 0, // Mask to or with fuse BROM_ERR_RESPONSE.