From 051339e28cb948d919c0714f1a2d3c65183c2a58 Mon Sep 17 00:00:00 2001 From: Aseda Aboagye Date: Wed, 11 Oct 2017 13:14:23 -0700 Subject: flash_ec: Save more variables. It was found on zoombini, when flashing via flash_ec failed, it would prevent the board from booting as certain controls were left in their "flashing" state. This was because these controls were missing from the variables list which is what was used to restore the controls. BUG=b:65694294 BRANCH=None TEST=Attempt to flash zoombini without the flex connected. Attach the servo flex, apply power, verify DUT boots up. Change-Id: Ic2bc74ef1a61d4f10da6d3ceac77fbd373697838 Signed-off-by: Aseda Aboagye Reviewed-on: https://chromium-review.googlesource.com/714023 Commit-Ready: Aseda Aboagye Tested-by: Aseda Aboagye Reviewed-by: Shawn N --- util/flash_ec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/util/flash_ec b/util/flash_ec index a7956f4c93..73d9a76ed9 100755 --- a/util/flash_ec +++ b/util/flash_ec @@ -433,9 +433,9 @@ esac # Not every control is supported on every servo type. Therefore, define which # controls are supported by each servo type. -servo_v2_VARS="jtag_buf_on_flex_en jtag_buf_en" -servo_micro_VARS= -servo_v4_with_ccd_cr50_VARS= +servo_v2_VARS="jtag_buf_on_flex_en jtag_buf_en cold_reset spi1_vref" +servo_micro_VARS="cold_reset spi1_vref" +servo_v4_with_ccd_cr50_VARS="cold_reset" # Flashing an STM32 over the UART requires modifying the UART properties along # with the boot mode pin. if [ "${CHIP}" = "stm32" ] ; then @@ -453,6 +453,9 @@ if $(in_array "${BOARDS_STM32_PROG_EN[@]}" "${BOARD}"); then fi toad_VARS="${MCU}_uart_parity ${MCU}_uart_baudrate boot_mode" +if $(in_array "${BOARDS_NPCX_INT_SPI[@]}" "${BOARD}"); then + servo_v2_VARS+=" fw_up" +fi # Some servo boards use the same controls. servo_v3_VARS="${servo_v2_VARS}" servo_v4_with_servo_micro_VARS="${servo_micro_VARS}" -- cgit v1.2.1