summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNamyoon Woo <namyoon@chromium.org>2019-08-09 13:14:03 -0700
committerCommit Bot <commit-bot@chromium.org>2019-08-10 00:49:48 +0000
commit023fb69d7ff6cb35bbe05708205f357133d9365b (patch)
tree699f955115a2916eca402b2788d561703893f90c
parent85d086a15e2dca92c573e5d36ef03db6b428a76b (diff)
downloadchrome-ec-023fb69d7ff6cb35bbe05708205f357133d9365b.tar.gz
flash_ec: removing the bandaid fix on setting i2c_mux for npcx_uut
The issue in http://b/126189871 has been fixed thanks to pseudo_i2c driver. There is no need to retry 'dut-control dut_i2c_mux:ec_prog'. BUG=b:126189871 BRANCH=none TEST=ran flash_ec on Ampton twice in a raw using CCD, and servo_v4 as well. Change-Id: I72e2bf8eb48dff7a3c81545221ac71a44469c033 Signed-off-by: Namyoon Woo <namyoon@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1746974 Reviewed-by: Matthew Blecker <matthewb@chromium.org>
-rwxr-xr-xutil/flash_ec18
1 files changed, 1 insertions, 17 deletions
diff --git a/util/flash_ec b/util/flash_ec
index 6a0dc479d1..7a46a692ee 100755
--- a/util/flash_ec
+++ b/util/flash_ec
@@ -1096,24 +1096,8 @@ function flash_it83xx() {
# there is a mux on the dut)
if servo_has_dut_i2c_mux; then
info "Switching DUT I2C Mux to ${CHIP}"
-
servo_save_add "dut_i2c_mux"
-
- # TODO(b/126189871): Investigate about the timeout in CCD mode,
- # and remove with this retry logic along with the fix.
- local num_attempts=1
- if [[ "${SERVO_TYPE}" =~ "ccd_cr50" ]]; then
- num_attempts=3
- fi
- while :; do
- if dut_control dut_i2c_mux:ec_prog; then
- break;
- fi
- if (( --num_attempts <= 0 )); then
- die "dut_i2c_mux failed."
- fi
- sleep 5
- done
+ dut_control dut_i2c_mux:ec_prog
fi
# Ensure that the AP is off while we are flashing the EC via: