commit bd04dad7bb188a47714f96334ee442bf4d99fa35
author David James <davidjames@google.com> Mon Dec 15 13:14:06 2014 -0800
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Wed Dec 17 02:12:57 2014 +0000
tree 494da616cf8a622c51d6fe340c1ded08ec50d685
parent c7a46e26106f1ba6270f86b41b0ade06f62af631

Use veyron_pinky Chrome prebuilts for veyron boards.

BUG=chromium:440151, chromium:405861
TEST=veyron_jerry-pre-cq

Change-Id: Ie15eb35f02215edce0eda8db6557ade028716e32
Reviewed-on: https://chromium-review.googlesource.com/235813
Trybot-Ready: David James <davidjames@chromium.org>
Tested-by: David James <davidjames@chromium.org>
Reviewed-by: Don Garrett <dgarrett@chromium.org>
Commit-Queue: David James <davidjames@chromium.org>

setup_board

diff --git a/setup_board b/setup_board
index 93f5d8d..c7ac454 100755
--- a/setup_board
+++ b/setup_board
@@ -217,7 +217,7 @@
   # i_arch_map / e_arch_map: maps architectures to internal / external boards.
   # i_kernel_map / e_kernel_map: maps kernels to internal / external boards.
   declare -A i_arch_map e_arch_map e_kernel_map i_kernel_map \
-             e_freon_arch_map i_freon_arch_map
+             e_chrome_arch_map i_chrome_arch_map
   local chrome_binhost_base kernel
   kernel=$(portageq-${BOARD_VARIANT} envvar CHROMEOS_KERNEL_SPLITCONFIG)
   e_kernel_map=(['chromeos-exynos5']='daisy'
@@ -246,23 +246,26 @@
   # Chrome binhost.
   local e_generic="${e_kernel_map[${kernel:-none}]:-${e_arch_map[${ARCH}]:-}}"
   local i_generic="${i_kernel_map[${kernel:-none}]:-${i_arch_map[${ARCH}]:-}}"
-  local e_freon="" i_freon=""
+  local e_chrome="" i_chrome=""
   if has ozone $(portageq-${BOARD_VARIANT} envvar USE); then
     # If ozone use flag is present, the grab Chrome prebuilts from a builder
     # that uses the ozone use flags. (This use flag only affects Chrome.)
-    e_freon_arch_map=(
+    e_chrome_arch_map=(
       ['amd64']='amd64-generic_freon'
       ['arm']='arm-generic_freon'
     )
-    i_freon_arch_map=(
+    i_chrome_arch_map=(
       ['amd64']='link_freon'
       ['arm']='rush_ryu'
     )
-    e_freon="${e_freon_arch_map[${ARCH}]:-}"
-    i_freon="${i_freon_arch_map[${ARCH}]:-}"
+    e_chrome="${e_chrome_arch_map[${ARCH}]:-}"
+    i_chrome="${i_chrome_arch_map[${ARCH}]:-}"
+  fi
+  if [[ "$BOARD" == "veyron" ]]; then
+    i_chrome="veyron_pinky"
   fi
   local board chrome_binhost internal_binhost preflight_binhost
-  for board in ${BOARD_VARIANT} ${i_freon} ${e_freon} \
+  for board in ${BOARD_VARIANT} ${i_chrome} ${e_chrome} \
                ${BOARD} ${i_generic} ${e_generic}; do
     if [[ -z ${chrome_binhost} || ! -f ${chrome_binhost} ]]; then
       chrome_binhost="${chrome_binhost_base}/${board}-${chrome_binhost_suffix}"