cros_bundle_firmware: Add defaults to fdt for cros_write_firmware
The Pit firmware branch is missing a number of nodes and properties that are
used by cros_bundle_firmware and cros_write_firmware. In particular, the
location of IRAM is now used to decide where to write the image during USB
A-A download.
cros_bundle_firmware already adds these missing nodes automatically. Move
the code that does this into SelectFdt() so that this step is done for
cros_write_firmware also. This makes it possible to flash the the firmware
branch while using ToT cros-devutils.
Also work around a buggy /memory node in the pit firmware branch.
BUG=chrome-os-partner:21115
BUG=chrome-os-partner:22184
TEST=manual
With firmware branch of U-Boot, but everything else ToT:
$ USE=dev emerge-peach_pit chromeos-u-boot chromeos-bootimage
$ cros_write_firmware -b peach_pit \
-i /build/peach_pit/firmware/image-peach-pit.bin -F spi
See that the flasher runs correctly.
Change-Id: I60d22e5cdecd770e259aee7d4f0533df1e52d352
Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/66621
Reviewed-by: Randall Spangler <rspangler@chromium.org>
diff --git a/host/lib/bundle_firmware.py b/host/lib/bundle_firmware.py
index f152d3c..a8c697f 100644
--- a/host/lib/bundle_firmware.py
+++ b/host/lib/bundle_firmware.py
@@ -929,9 +929,6 @@
self._out.Notice("Model: %s" % fdt.GetString('/', 'model'))
pack = PackFirmware(self._tools, self._out)
- # Get the flashmap so we know what to build. For board variants use the
- # main board name as the key (drop the _<variant> suffix).
- default_flashmap = default_flashmaps.get(self._board.split('_')[0], [])
if self._force_rw:
fdt.PutInteger('/flash/rw-a-vblock', 'preamble-flags', 0)
fdt.PutInteger('/flash/rw-b-vblock', 'preamble-flags', 0)
@@ -940,24 +937,6 @@
pack.use_efs = fdt.GetInt('/chromeos-config', 'early-firmware-selection',
0)
- if not fdt.GetProp('/flash', 'reg', ''):
- fdt.InsertNodes(default_flashmap)
-
- # Insert default values for any essential properties that are missing.
- # This should only happen for upstream U-Boot, until our changes are
- # upstreamed.
- if not fdt.GetProp('/iram', 'reg', ''):
- self._out.Warning('Cannot find /iram, using default')
- fdt.InsertNodes([i for i in default_flashmap if i['path'] == '/iram'])
-
- if not fdt.GetProp('/memory', 'reg', ''):
- self._out.Warning('Cannot find /memory, using default')
- fdt.InsertNodes([i for i in default_flashmap if i['path'] == '/memory'])
-
- if not fdt.GetProp('/config', 'samsung,bl1-offset', ''):
- self._out.Warning('Missing properties in /config, using defaults')
- fdt.InsertNodes([i for i in default_flashmap if i['path'] == '/config'])
-
pack.SelectFdt(fdt, self._board)
# Get all our blobs ready
@@ -1090,8 +1069,35 @@
arch_dts = 'tegra20.dtsi'
fdt.Compile(arch_dts)
- self.fdt = fdt.Copy(os.path.join(self._tools.outdir, 'updated.dtb'))
- return self.fdt
+ fdt = fdt.Copy(os.path.join(self._tools.outdir, 'updated.dtb'))
+
+ # Get the flashmap so we know what to build. For board variants use the
+ # main board name as the key (drop the _<variant> suffix).
+ default_flashmap = default_flashmaps.get(self._board.split('_')[0], [])
+
+ if not fdt.GetProp('/flash', 'reg', ''):
+ fdt.InsertNodes(default_flashmap)
+
+ # Insert default values for any essential properties that are missing.
+ # This should only happen for upstream U-Boot, until our changes are
+ # upstreamed.
+ if not fdt.GetProp('/iram', 'reg', ''):
+ self._out.Warning('Cannot find /iram, using default')
+ fdt.InsertNodes([i for i in default_flashmap if i['path'] == '/iram'])
+
+ # Sadly the pit branch has an invalid /memory node. Work around it for now.
+ # crosbug.com/p/22184
+ if (not fdt.GetProp('/memory', 'reg', '') or
+ fdt.GetIntList('/memory', 'reg')[0] == 0):
+ self._out.Warning('Cannot find /memory, using default')
+ fdt.InsertNodes([i for i in default_flashmap if i['path'] == '/memory'])
+
+ if not fdt.GetProp('/config', 'samsung,bl1-offset', ''):
+ self._out.Warning('Missing properties in /config, using defaults')
+ fdt.InsertNodes([i for i in default_flashmap if i['path'] == '/config'])
+
+ self.fdt = fdt
+ return fdt
def Start(self, hardware_id, output_fname, show_map):
"""This creates a firmware bundle according to settings provided.
