[U-Boot] [PATCH 11/29] binman: Allow help to work without libfdt
Simon Glass
sjg at chromium.org
Tue Jul 17 19:25:34 UTC 2018
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 at chromium.org>
---
tools/binman/control.py | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/tools/binman/control.py b/tools/binman/control.py
index 4fa505da81..3e5eac2c52 100644
--- a/tools/binman/control.py
+++ b/tools/binman/control.py
@@ -13,8 +13,6 @@ import tools
import command
import elf
-import fdt
-import fdt_util
from image import Image
import tout
@@ -129,6 +127,11 @@ def Binman(options, args):
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:
--
2.18.0.203.gfac676dfb9-goog
More information about the U-Boot
mailing list