commit 9b1a804d52832aa2ae62bef0254451606d5a1901
author Simon Glass <sjg@chromium.org> Tue Jul 17 13:25:34 2018 -0600
committer Simon Glass <sjg@chromium.org> Wed Aug 01 16:30:47 2018 -0600
tree f8746d28df965310a57e7683ad92741f774731de
parent bb74837c9a32e51187d843c2469f0176d674c5f9

binman: Allow help to work without libfdt

At present binman needs libfdt.py to be available before it will do
anything, even print help. Import those modules later to avoid this, as it
is bad practice to fail to even show help on startup.

Signed-off-by: Simon Glass <sjg@chromium.org>

tools/binman/control.py

diff --git a/tools/binman/control.py b/tools/binman/control.py
index ab894a8..3c931d9 100644
--- a/tools/binman/control.py
+++ b/tools/binman/control.py
@@ -13,8 +13,6 @@
 
 import command
 import elf
-import fdt
-import fdt_util
 from image import Image
 import tout
 
@@ -129,6 +127,11 @@
         options.indir.append(board_pathname)
 
     try:
+        # Import these here in case libfdt.py is not available, in which case
+        # the above help option still works.
+        import fdt
+        import fdt_util
+
         tout.Init(options.verbosity)
         elf.debug = options.debug
         try: