summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarthikeyan Ramasubramanian <kramasub@chromium.org>2018-10-12 23:48:07 -0600
committerchrome-bot <chrome-bot@chromium.org>2018-10-17 14:23:24 -0700
commit0f0829238ab5e2be3a649ab2e13e9f177a65f6e0 (patch)
tree033104218d7d757cbb84c17d9f3c5634c90e5c22
parent47cd57ac6b371bf7d13e137601fb4a1a9c18ae1a (diff)
downloadchrome-ec-0f0829238ab5e2be3a649ab2e13e9f177a65f6e0.tar.gz
util/flash_ec: Restore servo setting properly on error
Servo settings are not completely restored on error scenario. As an example when flash_ec has "Failed to determine chip size", it dies immediately. The cleanup procedure does not restore some of the servo settings like disabling GP mode. This in turn causes EC to never come out of reset until either the servo is disconnected and reconnected or the servod is killed and restarted. Restore the servo settings properly under error scenario so that EC comes out of reset. BRANCH=none BUG=b:117414172 TEST=Run flash_ec and ensure that EC comes out of reset Change-Id: I5512a44b5656ccc97686324a4d9b1bbcf07c6303 Signed-off-by: Karthikeyan Ramasubramanian <kramasub@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/1279434 Commit-Ready: Jett Rink <jettrink@chromium.org> Reviewed-by: Furquan Shaikh <furquan@chromium.org> Reviewed-by: Jett Rink <jettrink@chromium.org>
-rwxr-xr-xutil/flash_ec1
1 files changed, 1 insertions, 0 deletions
diff --git a/util/flash_ec b/util/flash_ec
index efee06dfee..9a2458a91c 100755
--- a/util/flash_ec
+++ b/util/flash_ec
@@ -672,6 +672,7 @@ toad_VARS="${MCU}_uart_parity ${MCU}_uart_baudrate boot_mode"
if $(in_array "${BOARDS_NPCX_INT_SPI[@]}" "${BOARD}"); then
servo_v2_VARS+=" fw_up"
+ servo_micro_VARS+=" fw_up"
fi
# Some servo boards use the same controls.
servo_v3_VARS="${servo_v2_VARS}"