commit 1502ea6720f4553854cd37fad5443e73d1d56dad
author Stefan Reinauer <reinauer@chromium.org> Thu Nov 01 10:15:38 2012 -0700
committer Gerrit <chrome-bot@google.com> Fri Nov 02 16:34:25 2012 -0700
tree 035a76dc7f877d2427f15356004ed89ef8a81a02
parent 3cb82815748e2d7f30829e1f6c77e500be339fe6

Switch cros_bundle_firmware to new cbfstool

cbfstool options changed to be more flexible. This
requires some changes to all scripts calling it.

BUG=none
TEST=emerge-link chromeos-bootimage still builds.
BRANCH=none

CQ-DEPEND=CL:*28286

Change-Id: Ifdb032bf2973b05f070adf297c9c8a823ab7f00f
Reviewed-on: https://gerrit.chromium.org/gerrit/37122
Reviewed-by: Ronald G. Minnich <rminnich@chromium.org>
Reviewed-by: Stefan Reinauer <reinauer@chromium.org>
Tested-by: Stefan Reinauer <reinauer@chromium.org>
Commit-Ready: Stefan Reinauer <reinauer@chromium.org>

host/lib/bundle_firmware.py

diff --git a/host/lib/bundle_firmware.py b/host/lib/bundle_firmware.py
index c9bf6e4..734fecd 100644
--- a/host/lib/bundle_firmware.py
+++ b/host/lib/bundle_firmware.py
@@ -671,8 +671,8 @@
     if not os.path.exists(self._tools.Filename(uboot_elf)):
       uboot_elf = uboot.replace('.bin', '.elf')
     shutil.copyfile(self._tools.Filename(coreboot), bootstub)
-    self._tools.Run('cbfstool', [bootstub, 'add-payload', uboot_elf,
-            'fallback/payload', 'lzma'])
+    self._tools.Run('cbfstool', [bootstub, 'add-payload', '-f', uboot_elf,
+            '-n', 'fallback/payload', '-c', 'lzma'])
 
     # Don't add the fdt yet since it is not in final form
     return bootstub
@@ -977,8 +977,8 @@
     if 'coreboot' in blob_list:
       bootstub = pack.GetProperty('coreboot')
       fdt = fdt.Copy(os.path.join(self._tools.outdir, 'bootstub.dtb'))
-      self._tools.Run('cbfstool', [bootstub, 'add', fdt.fname, 'u-boot.dtb',
-          '0xac'])
+      self._tools.Run('cbfstool', [bootstub, 'add', '-f', fdt.fname,
+          '-n', 'u-boot.dtb', '-t', '0xac'])
       bootstub_tmp = bootstub + '.tmp'
       self._tools.Run('dd', ['if=' + bootstub, 'of=' + bootstub_tmp,
           'bs=1M', 'skip=7'])