cros_bundle_firmware: Don't use --secureboot with the flasher
The flasher needs to use the normal boot mechanism since it sets up quite a long
bootcmd. This change keeps the original unchanged fdt around for use with the
flasher, so that it will still work when using secure boot.
The change is made in cros_write_firmware also just to keep it consistent.
BUG=chromium-os:17298
TEST=~/trunk/src/platform/dev/host/cros_bundle_firmware -w -u u-boot.bin -s -v2 -b tegra2_aebl --bootsecure --bootcmd vboot_twostop
See that the flasher still works
Change-Id: I5b1b1b9c7e96b662b4a969597bf9ef20733e8804
Reviewed-on: http://gerrit.chromium.org/gerrit/5594
Reviewed-by: Doug Anderson <dianders@chromium.org>
Reviewed-by: Che-Liang Chiou <clchiou@chromium.org>
Tested-by: Simon Glass <sjg@chromium.org>
diff --git a/host/lib/bundle_firmware.py b/host/lib/bundle_firmware.py
index 1675a07..8790f09 100644
--- a/host/lib/bundle_firmware.py
+++ b/host/lib/bundle_firmware.py
@@ -353,6 +353,9 @@
Args:
fdt_fname: The filename of the fdt to use.
+ Returns:
+ The Fdt object of the original fdt file, which we will not modify.
+
We make a copy of this which will include any on-the-fly changes we want
to make.
"""
@@ -360,6 +363,7 @@
self.CheckOptions()
fdt = Fdt(self._tools, self._fdt_fname)
self.fdt = fdt.Copy(os.path.join(self._tools.outdir, 'updated.dtb'))
+ return fdt
def Start(self, hardware_id, output_fname):
"""This creates a firmware bundle according to settings provided.