diff options
| author | Jett Rink <jettrink@chromium.org> | 2020-04-06 15:19:19 -0600 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-04-07 20:09:36 +0000 |
| commit | c34a3edc8a818858afbaf873eb56363107a892f1 (patch) | |
| tree | 67d5e8f98533750cd73f7d533ea2cf144510246a /util | |
| parent | 598ef8b43219dd769602f884b49556f64ed157c0 (diff) | |
| download | chrome-ec-c34a3edc8a818858afbaf873eb56363107a892f1.tar.gz | |
flash_ec: remove warm_reset for it83xx case
We removed the warm reset code for it I2C flashing recent, so we should
remove the warm reset clean up section. The cold reset is a superset of
warm reset.
BRANCH=none
BUG=b:153165576
TEST=waddledee flashing works
Signed-off-by: Jett Rink <jettrink@chromium.org>
Change-Id: Iac691bfa127dac0f279ac92519c58b0e4211873b
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2137922
Tested-by: David Schneider <dnschneid@chromium.org>
Reviewed-by: Jack Rosenthal <jrosenth@chromium.org>
Diffstat (limited to 'util')
| -rwxr-xr-x | util/flash_ec | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/util/flash_ec b/util/flash_ec index e1801fa090..1c5d4db4cb 100755 --- a/util/flash_ec +++ b/util/flash_ec @@ -598,11 +598,6 @@ cleanup() { dut_control ftdii2c_cmd:open dut_control ftdii2c_cmd:setclock fi - - # Let the AP boot back up. - if servo_has_warm_reset; then - dut_control warm_reset:off - fi fi servo_restore @@ -826,10 +821,14 @@ repo sync && sudo emerge hdctools servo-firmware && sudo servo_updater -b c2d2" # Waits ~40 seconds for Vref presence before timeout local LOOP_COUNTER=100 while [[ "$(dut_control_get h1_vref_present)" = "off" \ - && "${LOOP_COUNTER}" -gt 0 ]] ; do + && "${LOOP_COUNTER}" -gt 1 ]] ; do sleep 0.1 let LOOP_COUNTER=LOOP_COUNTER-1 done + # If we ran out of time, then just die now + if [[ "${LOOP_COUNTER}" -eq 1 ]] ; then + die "H1 Vref not present after waiting" + fi else # Ensure DUT is in clean state with H1 Reset dut_control cold_reset:on |