commit b9ba4e0c1505d6e0157376b86cc086ece26dddac
author Simon Glass <sjg@chromium.org> Sat Aug 24 07:22:44 2019 -0600
committer Simon Glass <sjg@chromium.org> Tue Oct 15 08:40:02 2019 -0600
tree a0686156cbdc102690cc019b5c7c5b3057a3a4cb
parent 862f8e217abeface19986bc24e0b661d04e9e7d7

binman: Allow use of help and entry-docs without libfdt

At present if libfdt is not available binman can't do anything much.
Improve the situation a little.

Ideally there should be a test to cover this, but I'm not quite sure how
to fake this.

Signed-off-by: Simon Glass <sjg@chromium.org>
(fixed up missing ReadChildData() enty test)

tools/binman/control.py

diff --git a/tools/binman/control.py b/tools/binman/control.py
index cb51bc2..8268eda 100644
--- a/tools/binman/control.py
+++ b/tools/binman/control.py
@@ -15,8 +15,6 @@
 import cbfs_util
 import command
 import elf
-from image import Image
-import state
 import tout
 
 # List of images we plan to create
@@ -113,6 +111,9 @@
     Returns:
         data extracted from the entry
     """
+    global Image
+    from image import Image
+
     image = Image.FromFile(image_fname)
     entry = image.FindEntryPath(entry_path)
     return entry.ReadData(decomp)
@@ -459,6 +460,9 @@
     Args:
         args: Command line arguments Namespace object
     """
+    global Image
+    global state
+
     if args.full_help:
         pager = os.getenv('PAGER')
         if not pager:
@@ -468,6 +472,10 @@
         command.Run(pager, fname)
         return 0
 
+    # Put these here so that we can import this module without libfdt
+    from image import Image
+    import state
+
     if args.cmd in ['ls', 'extract', 'replace']:
         try:
             tout.Init(args.verbosity)