diff options
| author | Mary Ruthven <mruthven@chromium.org> | 2022-02-16 17:53:28 +0000 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2022-02-17 01:51:07 +0000 |
| commit | e805778111060bcce4fe4d9f58f72c60179ec510 (patch) | |
| tree | 872e45db1353855ed97caa4106e55b2192e5a4a3 | |
| parent | 77ed078988a5ed391ca6b50ab0cd38b989480ee4 (diff) | |
| download | chrome-ec-e805778111060bcce4fe4d9f58f72c60179ec510.tar.gz | |
Revert "signer: modify major version and board id flags for mp manifest"v3.94_pp
This reverts commit af2b28dda917522ecd4c3e4a2f9a86de86868af0.
Reason for revert: Change the prepvt major version back to 6.
Original change's description:
> signer: modify major version and board id flags for mp manifest
>
> Set the major version to 5, and the board id flags to 0x10000 to match
> the mp manifest.
>
> BUG=b:207143125
> TEST=check the major version and flags in the prod manifest from the
> builder
>
> Change-Id: Ifeefc2fe396a6d14147d1ead2d8fbe935a045b00
> Signed-off-by: Mary Ruthven <mruthven@chromium.org>
> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3451002
> Reviewed-by: Vadim Bendebury <vbendeb@chromium.org>
Bug: b:207143125
Change-Id: I605fbaa1bcc4011be058679f5c66b3b9ec5a3e76
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3468979
Tested-by: Mary Ruthven <mruthven@chromium.org>
Auto-Submit: Mary Ruthven <mruthven@chromium.org>
Reviewed-by: Vadim Bendebury <vbendeb@chromium.org>
Commit-Queue: Vadim Bendebury <vbendeb@chromium.org>
| -rw-r--r-- | util/signer/ec_RW-manifest-dev.json | 2 | ||||
| -rw-r--r-- | util/signer/ec_RW-manifest-prod.json | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/util/signer/ec_RW-manifest-dev.json b/util/signer/ec_RW-manifest-dev.json index 4f3a4fce8c..7a29b4f7a7 100644 --- a/util/signer/ec_RW-manifest-dev.json +++ b/util/signer/ec_RW-manifest-dev.json @@ -39,7 +39,7 @@ "timestamp": 0, "epoch": 0, // FWR diversification contributor, 32 bits. - "major": 5, // FW2_HIK_CHAIN counter. + "major": 6, // FW2_HIK_CHAIN counter. "minor": 93, // Mostly harmless version field. "applysec": -1, // Mask to and with fuse BROM_APPLYSEC. "config1": 13, // Which BROM_CONFIG1 actions to take before launching. diff --git a/util/signer/ec_RW-manifest-prod.json b/util/signer/ec_RW-manifest-prod.json index a610180c72..0407dd867b 100644 --- a/util/signer/ec_RW-manifest-prod.json +++ b/util/signer/ec_RW-manifest-prod.json @@ -7,7 +7,7 @@ }, "board_id": 1179010630, // that's 0x46464646, a.k.a. 'FFFF' in ASCII "board_id_mask": 0, - "board_id_flags": 65536, // 0x10000 + "board_id_flags": 16, // 0x10 // Rollback state. "info": { "3": -1, "4": -1, "5": -1, "6": -1, @@ -46,7 +46,7 @@ // epoch/major/minor would be preferred "timestamp": 1, "epoch": 0, // FWR diversification contributor, 32 bits. - "major": 5, // FW2_HIK_CHAIN counter. + "major": 6, // FW2_HIK_CHAIN counter. "minor": 93, // Mostly harmless version field. "applysec": -1, // Mask to and with fuse BROM_APPLYSEC. "config1": 13, // Which BROM_CONFIG1 actions to take before launching. |