diff options
| author | Vadim Bendebury <vbendeb@chromium.org> | 2018-02-13 10:45:23 -0800 |
|---|---|---|
| committer | ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> | 2018-02-20 23:54:41 +0000 |
| commit | c7c449cd096d6edcfce1f1f26174cae64b8d1bdb (patch) | |
| tree | c570ec0bd1bbf38b4cae24a1b8875956b81bb241 | |
| parent | dffbb528fbb2656ae2c3ed602cf675f44b5fdbfc (diff) | |
| download | chrome-ec-c7c449cd096d6edcfce1f1f26174cae64b8d1bdb.tar.gz | |
signer: advance to new version number and erase new bit in the rollback map
This will prevent earlier released images from running on the device
unless Info1 is erased.
Conflicts:
util/signer/ec_RW-manifest-dev.json
util/signer/ec_RW-manifest-prod.json
Kept major revision number at 1.
BRANCH=cr50, cr50-mp
BUG=b:70891959
TEST=verified that two bits in the rollback mask have been erased now:
> sysinfo
Reset flags: 0x00000800 (hard)
[...]
Rollback: 2/2/128
Change-Id: Ic345c79010fbe0e075e14e652ea1eba263226ab1
Signed-off-by: Vadim Bendebury <vbendeb@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/916737
Reviewed-by: Mary Ruthven <mruthven@chromium.org>
(cherry picked from commit c07cbae93ca50c1c3b2565d82119f23ad6011c6f)
Reviewed-on: https://chromium-review.googlesource.com/927719
| -rw-r--r-- | util/signer/ec_RW-manifest-dev.json | 4 | ||||
| -rw-r--r-- | util/signer/ec_RW-manifest-prod.json | 4 |
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 bb61b6f852..fa36c59a93 100644 --- a/util/signer/ec_RW-manifest-dev.json +++ b/util/signer/ec_RW-manifest-dev.json @@ -7,7 +7,7 @@ }, // Rollback state. "info": { - "1": -1, "2": -1, "3": -1, "4": -1, "5": -1, "6": -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": 1, // FW2_HIK_CHAIN counter. - "minor": 1, // Mostly harmless version field. + "minor": 2, // 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 140c662710..f185c7caeb 100644 --- a/util/signer/ec_RW-manifest-prod.json +++ b/util/signer/ec_RW-manifest-prod.json @@ -7,7 +7,7 @@ }, // Rollback state. "info": { - "1": -1, "2": -1, "3": -1, "4": -1, "5": -1, "6": -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": 1, // FW2_HIK_CHAIN counter. - "minor": 1, // Mostly harmless version field. + "minor": 2, // 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. |