From dbf62710f78959df7b4bd9a6e21fb977aac6370f Mon Sep 17 00:00:00 2001
From: ChromeOS Developer <dparker@chromium.org>
Date: Tue, 18 Mar 2014 22:10:30 -0700
Subject: Make board names in flash_ec less prone to conflicts

BUG=None
BRANCH=None
TEST=Run util/flash_ec on peppy, spring, link. Verify flashing
complete successfully.

Change-Id: Ib388af6800ae208934d5b026a63f0567d31ef86e
Signed-off-by: Dave Parker <dparker@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/191304
Reviewed-by: Randall Spangler <rspangler@chromium.org>
---
 util/flash_ec | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 54 insertions(+), 9 deletions(-)

diff --git a/util/flash_ec b/util/flash_ec
index 5658b8039d..ee311e8243 100755
--- a/util/flash_ec
+++ b/util/flash_ec
@@ -39,6 +39,37 @@ die() {
   exit 1
 }
 
+# Note: Link is a special case and is not included here.
+BOARDS_LM4=(
+	falco
+	peppy
+	rambi
+	samus
+	squawks
+)
+
+BOARDS_STM32=(
+	big
+	blaze
+	discovery
+	firefly
+	fruitpie
+	nyan
+	pit
+	plankton
+	ryu
+	ryu_sh
+	samus_pd
+	snow
+	spring
+	veyron
+	zinger
+)
+
+BOARDS_STM32_DFU=(
+	twinkie
+)
+
 # Flags
 DEFINE_string board "${DEFAULT_BOARD}" \
 	"The board to run debugger on."
@@ -65,6 +96,18 @@ set -e
 
 SERVO_TYPE=servo
 
+in_array() {
+	local n=$#
+	local value=${!n}
+
+	for (( i=1; i<$#; i++ )) do
+		if [ "${!i}" == "${value}" ]; then
+			return 0
+		fi
+	done
+	return 1
+}
+
 # reset the EC
 toad_ec_hard_reset() {
 	if dut_control cold_reset 2>/dev/null ; then
@@ -327,14 +370,16 @@ info "${MCU} UART pty : ${EC_UART}"
 
 save="$(servo_save)"
 
-case "${BOARD}" in
-	big | discovery | nyan | pit | snow | spring | veyron ) flash_stm32 ;;
-	fruitpie | zinger | firefly | samus_pd | ryu | ryu_sh ) flash_stm32 ;;
-	plankton ) flash_stm32 ;;
-	twinkie) flash_stm32_dfu ;;
-	falco | peppy | rambi | samus | squawks ) flash_lm4 ;;
-	link ) flash_link ;;
-	*) die "board ${BOARD} not supported" ;;
-esac
+if $(in_array "${BOARDS_LM4[@]}" "${BOARD}"); then
+	flash_lm4
+elif $(in_array "${BOARDS_STM32[@]}" "${BOARD}"); then
+	flash_stm32
+elif $(in_array "${BOARDS_STM32_DFU[@]}" "${BOARD}"); then
+	flash_stm32_dfu
+elif [ "${BOARD}" == "link" ]; then
+	flash_link
+else
+	die "board ${BOARD} not supported"
+fi
 
 info "Flashing done."
-- 
cgit v1.2.1