commit 33cd0e51506aee00b8d67590da97449f8f6e6cc1
author Simon Glass <sjg@chromium.org> Sun Aug 11 17:40:03 2013 -0600
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Wed Aug 28 19:53:19 2013 +0000
tree 2cd999ec1a13bce698c785d4e220292df89dc37b
parent e53abbc42d1f333b53e151c224cd79d139cd81b2

cros_bundle_firmware: Add spl debug and vboot persist BL2 params

Add a parameter to control SPL debugging and the address of the vboot
persist region, also needed by SPL.

BUG=chrome-os-partner:21115
BRANCH=pit
TEST=manual
With U-Boot changes, see that SPL can locate and use the persist region.
Use:

crosfw -VFS -a '--add-config-int spl-debug 1'

and:

crosfw -VFS -a '--add-config-int spl-debug 0'

to check that debugging can be enabled/disabled.

Change-Id: I9cfa5b550caa0d0fae69b06e9f95be27c4789540
Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/65530
Reviewed-by: Che-Liang Chiou <clchiou@chromium.org>

host/lib/exynos.py

diff --git a/host/lib/exynos.py b/host/lib/exynos.py
index 030cf10..82f19b4 100644
--- a/host/lib/exynos.py
+++ b/host/lib/exynos.py
@@ -90,6 +90,38 @@
     return (use_efs_memory and
             fdt.GetInt('/chromeos-config', 'early-firmware-selection', 0))
 
+  def _GetAddress(self, fdt, use_efs_memory, name, config_node='/config',
+                  allow_none=False):
+    """Work out the correct address for a region of memory.
+
+    This deals with EFS and the memory map automatically.
+
+    Args:
+      fdt: Device tree file containing memory map.
+      use_efs_memory: True to return the address in EFS memory (i.e. SRAM),
+          False to use SDRAM
+      name: Name of the region to look up, e.g. 'u-boot'
+      config_node: Node containing configuration information
+      allow_none: True if it is OK to find nothing.
+
+    Returns:
+      Address to load that region, or None if none.
+    """
+    efs_suffix = ''
+    if self._BootingUsingEFS(fdt, use_efs_memory):
+      efs_suffix = ',efs'
+
+    # Use the correct memory section, and then find the offset in that.
+    default = 'none' if allow_none else None
+    memory = fdt.GetString(config_node, '%s-memory%s' % (name, efs_suffix),
+                           default)
+    if memory == 'none':
+      return None
+    base = fdt.GetIntList(memory, 'reg')[0]
+    offset = fdt.GetIntList(config_node, '%s-offset%s' % (name, efs_suffix))[0]
+    addr = base + offset
+    return addr
+
   def GetUBootAddress(self, fdt, use_efs_memory):
     """Work out the correct address for loading U-Boot.
 
@@ -103,15 +135,7 @@
     Returns:
       Address to load U-Boot
     """
-    efs_suffix = ''
-    if self._BootingUsingEFS(fdt, use_efs_memory):
-      efs_suffix = ',efs'
-
-    # Use the correct memory section, and then find the offset in that.
-    memory = fdt.GetString('/config', 'u-boot-memory' + efs_suffix)
-    base = fdt.GetIntList(memory, 'reg')[0]
-    offset = fdt.GetIntList('/config', 'u-boot-offset' + efs_suffix)[0]
-    addr = base + offset
+    addr = self._GetAddress(fdt, use_efs_memory, 'u-boot')
     self._out.Notice('EFS: Loading U-Boot to %x' % addr)
     return addr
 
@@ -331,6 +355,17 @@
       elif param == 'd':
         value = 1 if skip_sdram_init else 0
         self._out.Info('  Skip SDRAM init: %d' % value)
+      elif param == 'p':
+        addr = self._GetAddress(fdt, use_efs_memory, 'vboot-persist',
+                                '/chromeos-config', True)
+        if addr is None:
+          value = 0
+        else:
+          value = addr
+        self._out.Info('  Vboot persist addr: %x' % value)
+      elif param == 'D':
+        value = fdt.GetBool('/config', 'spl-debug')
+        self._out.Info('  SPL debug: %d' % value)
       else:
         self._out.Warning("Unknown machine parameter type '%s'" % param)
         self._out.Info('  Unknown value: %#0x' % value)