chrome_cr50: use console output to detect reboot
When we aren't using ccd, we need a way to wait until the console is up
before continuing after a reboot. This change checks the console output
after the reboot command to detect when Cr50 is done resetting.
BUG=none
BRANCH=none
TEST=none
Change-Id: I9f4a2550ce4d3453e9eda098cb1f1cd32f56701f
Signed-off-by: Mary Ruthven <mruthven@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/558647
Reviewed-by: Aseda Aboagye <aaboagye@chromium.org>
diff --git a/server/cros/servo/chrome_cr50.py b/server/cros/servo/chrome_cr50.py
index bc2a1d8..da94cb0 100644
--- a/server/cros/servo/chrome_cr50.py
+++ b/server/cros/servo/chrome_cr50.py
@@ -105,9 +105,12 @@
def reboot(self):
"""Reboot Cr50 and wait for CCD to be enabled"""
- self.send_command('reboot')
- self.wait_for_ccd_disable()
- self.ccd_enable()
+ if self.using_ccd():
+ self.send_command('reboot')
+ self.wait_for_ccd_disable()
+ self.ccd_enable()
+ else:
+ self.send_command_get_output('reboot', ['Console is enabled;'])
def rollback(self, eraseflashinfo=True):
