diff options
| author | Vadim Bendebury <vbendeb@chromium.org> | 2016-10-05 19:55:21 -0700 |
|---|---|---|
| committer | Hung-Te Lin <hungte@chromium.org> | 2016-11-24 04:55:49 +0000 |
| commit | 1c60f34089033563164e5dac5d0bba2e6b50c7f7 (patch) | |
| tree | 3600959223af497b45b6800659a3eaa1fc1f43a6 | |
| parent | 6fa1443c9c9f8b12852f840b40e11fbcfe75458c (diff) | |
| download | chrome-ec-1c60f34089033563164e5dac5d0bba2e6b50c7f7.tar.gz | |
usb_updater: always reboot cr50 in the end of the update
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>
(cherry picked from commit 16da7484246d00f37e34a93c97b65cdb41b02dbe)
Reviewed-on: https://chromium-review.googlesource.com/414725
Reviewed-by: Hung-Te Lin <hungte@chromium.org>
Commit-Queue: Hung-Te Lin <hungte@chromium.org>
Tested-by: Hung-Te Lin <hungte@chromium.org>
Trybot-Ready: Hung-Te Lin <hungte@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. */ |