commit 49b026bdcc6800ac6bf8bcf1a197918bcc097ed7
author Simon Glass <sjg@chromium.org> Fri Apr 26 16:38:42 2013 -0700
committer ChromeBot <chrome-bot@google.com> Sat May 18 14:16:58 2013 -0700
tree 3498ac4a0515ff99eeb460eb1cb4a62aa4b88f3a
parent 93673cf67bc7bcc88d0470d656bb91cd2ca5bcef

cros_bundle_firmware: Automatically select BL1/BL2 for daisy/peach

Rather than using the wrong default, select the Exynos model name based on
the board type.

BUG=chrome-os-partner:18451
TEST=manual
Run cros_bundle_firmware with '-b peach_pit' and see that it no longer
complains about missing Exynos 5250 files. Run with '-b daisy' and see
that it picks up the 5250 files.

Force 'model' to none, and see that when no '--bl1' is provided, we get
a fairly sensible error:

    Cannot find value for entry property 'exynos-bl1'

Change-Id: I3e83fe90f5ab509dc3a5a3bfd916529f457f57a9
Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/49398
Reviewed-by: Vadim Bendebury <vbendeb@chromium.org>

host/lib/bundle_firmware.py

diff --git a/host/lib/bundle_firmware.py b/host/lib/bundle_firmware.py
index c83119d..ffec8d1 100644
--- a/host/lib/bundle_firmware.py
+++ b/host/lib/bundle_firmware.py
@@ -151,6 +151,12 @@
   'force-dev-boot-legacy': 0x00000080,
 }
 
+# Maps board name to Exynos product number
+type_to_model = {
+  'peach' : '5420',
+  'daisy' : '5250'
+}
+
 def ListGoogleBinaryBlockFlags():
   """Print out a list of GBB flags."""
   print '   %-30s %s' % ('Available GBB flags:', 'Hex')
@@ -330,16 +336,20 @@
     """Check provided options and select defaults."""
     build_root = self._GetBuildRoot()
 
+    board_type = self._board.split('_')[0]
+    model = type_to_model.get(board_type)
+
     if not self.uboot_fname:
       self.uboot_fname = os.path.join(build_root, 'u-boot.bin')
     if not self.bct_fname:
       self.bct_fname = os.path.join(build_root, 'bct', 'board.bct')
     if not self.bmpblk_fname:
       self.bmpblk_fname = os.path.join(build_root, 'bmpblk.bin')
-    if not self.exynos_bl1:
-      self.exynos_bl1 = os.path.join(build_root, 'E5250.nbl1.bin')
-    if not self.exynos_bl2:
-      self.exynos_bl2 = os.path.join(build_root, 'smdk5250-spl.bin')
+    if model:
+      if not self.exynos_bl1:
+        self.exynos_bl1 = os.path.join(build_root, 'E%s.nbl1.bin' % model)
+      if not self.exynos_bl2:
+        self.exynos_bl2 = os.path.join(build_root, 'smdk%s-spl.bin' % model)
     if not self.coreboot_fname:
       self.coreboot_fname = os.path.join(build_root, 'coreboot.rom')
     if not self.skeleton_fname: