diff options
| author | Vadim Bendebury <vbendeb@chromium.org> | 2017-03-20 21:32:33 -0700 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2017-03-22 22:01:54 -0700 |
| commit | 9e931878cad2e55094713d7c7da4867533e40f4b (patch) | |
| tree | e8066b4a76d6c100e67338c6785a31fdd831fb99 /util/signer | |
| parent | 218f65dda650e775b9e28e5dee9704f6511e8a28 (diff) | |
| download | chrome-ec-9e931878cad2e55094713d7c7da4867533e40f4b.tar.gz | |
g: add code to corrupt new header until further notice and move rw to 0.0.19
With the rest of support in place, this patch adds code which would
corrupt the headers received during firmware updates.
The VENDOR_CC_TURN_UPDATE_ON vendor command will be required to enable
the new images.
Care should be taken that other commands operating on the inactive
image header do not do anything with it before it was enabled, some
code is being added for that.
The minor RW version is being bumped up to 19 to clearly indicate that
the device is expecting the vendor command to enable the new image
(this is used by usb_updater when downloading the image without the -p
or -u command line options).
BRANCH=cr50
BUG=b:35580805
TEST=verified that the new image can be installed and started by the
new usb_updater.
- the inactive header after uploading with the -p option (the
image_size field's offset is 0x32c):
> md 0x84320 4
00084320: 00000000 00000000 80033800 00084000
rebooting the device does not start the new image.
- the inactive header after uploading without the -p option:
> md 0x84320 4
00084320: 00000000 00000000 00033800 00084000
the device running a DBG image reports the following in the end of
the image update:
[64.176780 FW update: done]
turn_update_on: rebooting in 100 ms
Change-Id: I4d763eb89c8b1a43a13697033201066779826e85
Signed-off-by: Vadim Bendebury <vbendeb@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/457678
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Diffstat (limited to 'util/signer')
| -rw-r--r-- | util/signer/ec_RW-manifest-dev.json | 2 | ||||
| -rw-r--r-- | util/signer/ec_RW-manifest-prod.json | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/util/signer/ec_RW-manifest-dev.json b/util/signer/ec_RW-manifest-dev.json index 22cb6fa9b8..db6bbc3373 100644 --- a/util/signer/ec_RW-manifest-dev.json +++ b/util/signer/ec_RW-manifest-dev.json @@ -40,7 +40,7 @@ "timestamp": 0, "epoch": 0, // FWR diversification contributor, 32 bits. "major": 0, // FW2_HIK_CHAIN counter. - "minor": 18, // Mostly harmless version field. + "minor": 19, // 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 47515f0a72..77bdf15828 100644 --- a/util/signer/ec_RW-manifest-prod.json +++ b/util/signer/ec_RW-manifest-prod.json @@ -44,7 +44,7 @@ "timestamp": 1, "epoch": 0, // FWR diversification contributor, 32 bits. "major": 0, // FW2_HIK_CHAIN counter. - "minor": 18, // Mostly harmless version field. + "minor": 19, // 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. |