diff options
| author | Jett Rink <jettrink@chromium.org> | 2018-10-08 10:34:56 -0600 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2018-10-12 18:55:02 -0700 |
| commit | b6be8311960db02ca0c86c9471bc6e45b9cbcb90 (patch) | |
| tree | 765b202cd8fb1b6dcf64f7b8abdbc92575fd6697 /util | |
| parent | bcc0bcefa5aef4da99f80151c157437704d538c9 (diff) | |
| download | chrome-ec-b6be8311960db02ca0c86c9471bc6e45b9cbcb90.tar.gz | |
octopus: add servoV4 flash methods
Update flash_ec to handle using servo V4 with either USB-C or servo
micro. The script should automatically chose the correct flashing method
based on the connected servo instance.
There are still outstanding issues with both servoV4 USB-C (b:117416485)
and servo micro (b:117342440).
The following servo types will choose UART SPI flashing
servo_v2
servo_v4_with_servo_micro
The following servo types will choose CR50 UUI flashing
servo_v4_with_ccd_cr50
ccd_cr50
BRANCH=none
BUG=b:79147341
TEST=This worked with servoV4 and older firmware using USB-C. I can also
tell that servo micro goes down the correct path and doesn't get caught
on which flashing method (i.e. chip) to use.
Change-Id: I219bad8fdf8cea37aacb756d85b1f68d007bca73
Signed-off-by: Jett Rink <jettrink@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/1268855
Diffstat (limited to 'util')
| -rwxr-xr-x | util/flash_ec | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/util/flash_ec b/util/flash_ec index 4f63aefaa1..efee06dfee 100755 --- a/util/flash_ec +++ b/util/flash_ec @@ -146,8 +146,13 @@ BOARDS_NPCX_INT_SPI=( ) BOARDS_NPCX_UUT=( + bobba cheza + fleex grunt + meep + phaser + yorp ) BOARDS_NRF51=( @@ -184,8 +189,18 @@ BOARDS_RAIDEN=( # i.e., If a board needs to use one CHIP when connected via a Suzy-Q and another # chip when connected via a Servo. declare -A VALID_CHIP_COMBO +VALID_CHIP_COMBO["bobba.npcx_spi"]="(servo_micro|servo_v2)" +VALID_CHIP_COMBO["bobba.npcx_uut"]="ccd_cr50" +VALID_CHIP_COMBO["fleex.npcx_spi"]="(servo_micro|servo_v2)" +VALID_CHIP_COMBO["fleex.npcx_uut"]="ccd_cr50" +VALID_CHIP_COMBO["grunt.npcx_spi"]="(servo_micro|servo_v2)" VALID_CHIP_COMBO["grunt.npcx_uut"]="ccd_cr50" -VALID_CHIP_COMBO["grunt.npcx_spi"]="servo" +VALID_CHIP_COMBO["meep.npcx_spi"]="(servo_micro|servo_v2)" +VALID_CHIP_COMBO["meep.npcx_uut"]="ccd_cr50" +VALID_CHIP_COMBO["phaser.npcx_spi"]="(servo_micro|servo_v2)" +VALID_CHIP_COMBO["phaser.npcx_uut"]="ccd_cr50" +VALID_CHIP_COMBO["yorp.npcx_spi"]="(servo_micro|servo_v2)" +VALID_CHIP_COMBO["yorp.npcx_uut"]="ccd_cr50" DEFAULT_PORT="${SERVOD_PORT:-9999}" BITBANG_RATE="9600" # Could be overwritten by a command line option. @@ -336,7 +351,7 @@ else for i in "${SUPPORTED_CHIPS[@]}"; do SUPPORTED_SERVO="${VALID_CHIP_COMBO["${BOARD}.${i}"]}" if [[ -z "$SUPPORTED_SERVO" || \ - "$SERVO_TYPE" =~ "$SUPPORTED_SERVO" ]]; then + "$SERVO_TYPE" =~ $SUPPORTED_SERVO ]]; then FILTERED_CHIPS+=("$i") fi |