diff options
| author | Vadim Bendebury <vbendeb@chromium.org> | 2016-10-05 19:55:21 -0700 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2016-10-06 23:31:41 -0700 |
| commit | 16da7484246d00f37e34a93c97b65cdb41b02dbe (patch) | |
| tree | c6dcf3e54ed55974f686b541af46eb5da9c228ab | |
| parent | c0813cddb0c4116a49446bf6fb599775af5846ba (diff) | |
| download | chrome-ec-stabilize-8872.70.B.tar.gz | |
usb_updater: always reboot cr50 in the end of the updatestabilize-8872.70.Bstabilize-8872.6.Bstabilize-8872.40.Bstabilize-8872.15.Brelease-R55-8872.B
With the recent modification of the tpm reset processing the only way
to get the cr50 restart is to reset it internally.
Make sure that usb_updater triggers the cr50 reset in the end of the
update.
BRANCH=none
BUG=none
TEST=with the corresponding init script changes the update on reef
happens as expected.
Change-Id: Ib49b81c4ef6d12d0b877a8a63493cf4d6d5aaeb0
Signed-off-by: Vadim Bendebury <vbendeb@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/394255
Reviewed-by: Mary Ruthven <mruthven@chromium.org>
| -rw-r--r-- | extra/usb_updater/usb_updater.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/extra/usb_updater/usb_updater.c b/extra/usb_updater/usb_updater.c index b75a84a014..b12451bcdc 100644 --- a/extra/usb_updater/usb_updater.c +++ b/extra/usb_updater/usb_updater.c @@ -302,7 +302,7 @@ static void usage(int errs) " -h,--help Show this message\n" " -s,--spi Use /dev/tmp0 (-d is ignored)\n" " -u,--upstart " - "Upstart mode (strict header checks, no reboot)\n" + "Upstart mode (strict header checks)\n" "\n", progname, VID, PID); exit(errs ? update_error : noop); @@ -958,7 +958,7 @@ static int transfer_and_reboot(struct transfer_descriptor *td, } printf("-------\nupdate complete\n"); - if ((td->ep_type == usb_xfer) && !td->upstart_mode) { + if (td->ep_type == usb_xfer) { uint32_t out; /* Send stop request, ignoring reply. */ |