commit 8e1fdb2504822a6104e411765f9ee8f3885e9c28
author Simon Glass <sjg@chromium.org> Thu Mar 15 21:02:10 2012 -0700
committer Gerrit <chrome-bot@google.com> Mon Mar 19 21:23:21 2012 -0700
tree 19548f1f69cbb7f62024b2ba50b899e4d60524ce
parent 1d37683561e3d803ca36ce1939d06804af6ec6db

cros_bundle_firmware: Support exynos 'u' machine parameter

This parameter is the size of the U-Boot data to copy into SDRAM in
the SPL stage. Support this by calculating the size and inserting the
value.

BUG=chromium-os:19724
TEST=manual: run cros_bundle_firmware
See that it updates the updated-spl.bin with the correct size

Change-Id: Ic54932c194035fdcf028aab2f6a910bdf93ddc51
Reviewed-on: https://gerrit.chromium.org/gerrit/18327
Commit-Ready: Simon Glass <sjg@chromium.org>
Reviewed-by: Simon Glass <sjg@chromium.org>
Tested-by: Simon Glass <sjg@chromium.org>

host/lib/bundle_firmware.py

diff --git a/host/lib/bundle_firmware.py b/host/lib/bundle_firmware.py
index cf900b6..a658beb 100644
--- a/host/lib/bundle_firmware.py
+++ b/host/lib/bundle_firmware.py
@@ -458,7 +458,7 @@
         '0xac'])
     return bootstub
 
-  def _UpdateBl2Parameters(self, fdt, data, pos):
+  def _UpdateBl2Parameters(self, fdt, pack, data, pos):
     """Update the parameters in a BL2 blob.
 
     We look at the list in the parameter block, extract the value of each
@@ -466,6 +466,7 @@
 
     Args:
       fdt: Device tree containing the parameter values.
+      pack: The firmware packer object
       data: The BL2 data.
       pos: The position of the start of the parameter block.
 
@@ -504,6 +505,14 @@
       elif param == 'v':
         value = 31
         self._out.Info('  Memory interleave: %#0x' % value)
+      elif param == 'u':
+        value = os.stat(pack.GetProperty('boot+dtb')).st_size
+        value = (value + 0xfff) & ~0xfff
+
+        # Seems to not work if this is another value
+        #value += 0x3000
+        value = 0x40000
+        self._out.Info('  U-Boot size: %#0x' % value)
       else:
         self._out.Warning("Unknown machine parameter type '%s'" % param)
         value = struct.unpack('<1L', data[pos + upto:pos + upto + 4])[0]
@@ -515,13 +524,14 @@
     self._out.Info('BL2 configuration complete')
     return data
 
-  def _ConfigureExynosBl2(self, fdt, orig_bl2):
+  def _ConfigureExynosBl2(self, fdt, pack, orig_bl2):
     """Configure an Exynos BL2 binary for our needs.
 
     We create a new modified BL2 and return its filename.
 
     Args:
       fdt: Device tree containing the parameter values.
+      pack: The firmware packer object
       orig_bl2: Filename of original BL2 file to modify.
     """
     bl2 = os.path.join(self._tools.outdir, 'updated-spl.bin')
@@ -534,7 +544,7 @@
     if not pos:
       raise CmdError("Could not find machine parameter block in '%s'" %
           orig_bl2)
-    self._UpdateBl2Parameters(fdt, data, pos)
+    data = self._UpdateBl2Parameters(fdt, pack, data, pos)
     self._tools.WriteFile(bl2, data)
     return bl2
 
@@ -570,7 +580,7 @@
     elif blob_type == 'exynos-bl1':
       pack.AddProperty(blob_type, self.exynos_bl1)
     elif blob_type == 'exynos-bl2':
-      bl2 = self._ConfigureExynosBl2(fdt, self.exynos_bl2)
+      bl2 = self._ConfigureExynosBl2(fdt, pack, self.exynos_bl2)
       pack.AddProperty(blob_type, bl2)
     elif pack.GetProperty(blob_type):
       pass