commit 468d87593f9612aaf05c1dd023c8874dcfbb1f7f
author Simon Glass <sjg@chromium.org> Wed Sep 19 16:36:19 2012 -0700
committer Gerrit <chrome-bot@google.com> Fri Sep 21 10:02:37 2012 -0700
tree f9204a5277be85dde76353757bbd043bec917201
parent 716b48c5e362d8b9c6945b141aee62b69bfaed11

cros_bundle_firmware: Support an empty boot command

It is useful to pass an option to provide an empty boot command to U-Boot,
like:

 --bootcmd none

Handle this as a special case.

BUG=none
TEST=manual
On snow with USB A-A connected:
(cros) $ cros_bundle_firmware -b daisy -d exynos5250-now --bootcmd none -w usb

See that it boots U-Boot and does not display the 'Unknown command' error
below:

Hit any key to stop autoboot:  0
Unknown command '' - try 'help'

Change-Id: I3ab93a43a6fb9b4912c413d6c4a79a27bcda662c
Reviewed-on: https://gerrit.chromium.org/gerrit/33648
Reviewed-by: Randall Spangler <rspangler@chromium.org>
Commit-Ready: 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 323fae2..ee094ce 100644
--- a/host/lib/bundle_firmware.py
+++ b/host/lib/bundle_firmware.py
@@ -319,7 +319,9 @@
       bootcmd: Boot command to use, as a string (if None this this is a nop).
       bootsecure: We'll set '/config/bootsecure' to 1 if True and 0 if False.
     """
-    if bootcmd:
+    if bootcmd is not None:
+      if bootcmd == 'none':
+        bootcmd = ''
       self.fdt.PutString('/config', 'bootcmd', bootcmd)
       self.fdt.PutInteger('/config', 'bootsecure', int(bootsecure))
       self._out.Info('Boot command: %s' % bootcmd)