summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVadim Bendebury <vbendeb@chromium.org>2017-03-15 10:37:34 -0700
committerVadim Bendebury <vbendeb@chromium.org>2017-03-16 00:05:31 +0000
commit6fc0993257ab99b6d992f5f1a2e8248117049011 (patch)
tree754a7ee27809e5e86b84c83317e8ed88a2919674
parent41bdc319bcf39042e08b1af75db611170b7da6e5 (diff)
downloadchrome-ec-6fc0993257ab99b6d992f5f1a2e8248117049011.tar.gz
cr50: prepare to release rw 0.0.18
Erase the first location in the manifest info map to ensure that the flash info state is updates and then the RO prevents booting earlier images (where the map is unaltered). BRANCH=cr50 BUG=none TEST=verified that once both RW_A and RW_B are programmed with the new image and the H1 is restarted, the first info map location is erased. Change-Id: Id48d8a2009f7cf9842b7a33f036dc98457dbeafc Signed-off-by: Vadim Bendebury <vbendeb@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/455580 Reviewed-by: Mary Ruthven <mruthven@chromium.org> Reviewed-by: Marius Schilder <mschilder@chromium.org> (cherry picked from commit 597a3bc943fd2517ec877bacf9357687fbffdc0b) Reviewed-on: https://chromium-review.googlesource.com/456046
-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 e97e963401..22cb6fa9b8 100644
--- a/util/signer/ec_RW-manifest-dev.json
+++ b/util/signer/ec_RW-manifest-dev.json
@@ -7,7 +7,7 @@
},
// Rollback state.
"info": {
- "0": -1, "1": -1, "2": -1, "3": -1, "4": -1, "5": -1, "6": -1,
+ "1": -1, "2": -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": 0, // FW2_HIK_CHAIN counter.
- "minor": 17, // Mostly harmless version field.
+ "minor": 18, // 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 2234f30f3d..47515f0a72 100644
--- a/util/signer/ec_RW-manifest-prod.json
+++ b/util/signer/ec_RW-manifest-prod.json
@@ -7,7 +7,7 @@
},
// Rollback state.
"info": {
- "0": -1, "1": -1, "2": -1, "3": -1, "4": -1, "5": -1, "6": -1,
+ "1": -1, "2": -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": 0, // FW2_HIK_CHAIN counter.
- "minor": 17, // Mostly harmless version field.
+ "minor": 18, // 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.