summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Blecker <matthewb@chromium.org>2018-10-24 18:48:06 -0700
committerchrome-bot <chrome-bot@chromium.org>2019-04-01 18:41:30 -0700
commitaab7a81e55ba410152229d4b54f816c7460d5ec0 (patch)
tree5ee35fcebf46dd659bd84f480803150968322475
parentc321f0945bebd3e84edab78582fd01785f5e256b (diff)
downloadchrome-ec-aab7a81e55ba410152229d4b54f816c7460d5ec0.tar.gz
flash_ec: Have iteflash use I2C through servod with CR50 CCD.
Previously flash_ec would instruct iteflash to communicate directly with CR50 when using CCD. Now the same communication path through servod is used with Servo Micro is also used with CR50. Benefits: 1) Allows for resolving b:126189871 without adding significant new complexity in servod. Without this, fixing that bug would involve implementing CR50 I2C USB endpoint disconnect and reconnect commands, exposing them through dut-control, and ensuring they play nicely with I2cPseudoAdapter. With this, that bug can be trivially fixed, and then the retry loop in flash_ec around dut_i2c_mux:ec_prog can be deleted. 2) Simplifies flash_ec with slightly less differences needed in iteflash invocation. BRANCH=none BUG=b:75976718,b:79684405,b:124388894,b:126189871 CQ-DEPEND=CL:1250029,CL:1546592 TEST=The following servo + board combinations were tested: flash_ec -> iteflash -> servo_micro -> bip flash_ec -> iteflash -> servo_v4 -> servo_micro -> bip flash_ec -> iteflash -> servo_v2 -> bip flash_ec -> iteflash -> servo_v4 -> cr50 -> bip Change-Id: I36009b01e45576c786ea78853baf46b52d2232d6 Signed-off-by: Matthew Blecker <matthewb@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/1522846 Reviewed-by: Namyoon Woo <namyoon@chromium.org>
-rwxr-xr-xutil/flash_ec10
1 files changed, 4 insertions, 6 deletions
diff --git a/util/flash_ec b/util/flash_ec
index e9e4700361..d0d3ace2b5 100755
--- a/util/flash_ec
+++ b/util/flash_ec
@@ -1151,13 +1151,11 @@ function flash_it83xx() {
if [[ "${SERVO_TYPE}" == "servo_v2" ]]; then
ITEFLASH_ARGS+=( "--send-waveform=1" "--i2c-interface=ftdi" )
else
- ITEFLASH_ARGS+=( "--send-waveform=0" )
+ ITEFLASH_ARGS=( "sudo" "--" "${ITEFLASH_ARGS[@]}" \
+ "--send-waveform=0" "--i2c-interface=linux" \
+ "--i2c-dev-path=$(dut_i2c_dev)" )
if [[ "${SERVO_TYPE}" =~ "ccd_cr50" ]]; then
- ITEFLASH_ARGS+=( "--i2c-interface=ccd" )
- else
- ITEFLASH_ARGS=( "sudo" "--" "${ITEFLASH_ARGS[@]}" \
- "--i2c-interface=linux" \
- "--i2c-dev-path=$(dut_i2c_dev)" )
+ ITEFLASH_ARGS+=( "--block-write-size=256" )
fi
fi