From 023fb69d7ff6cb35bbe05708205f357133d9365b Mon Sep 17 00:00:00 2001 From: Namyoon Woo Date: Fri, 9 Aug 2019 13:14:03 -0700 Subject: 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 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1746974 Reviewed-by: Matthew Blecker --- util/flash_ec | 18 +----------------- 1 file changed, 1 insertion(+), 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: -- cgit v1.2.1