From 9b1a804d52832aa2ae62bef0254451606d5a1901 Mon Sep 17 00:00:00 2001
From: Simon Glass <sjg@chromium.org>
Date: Tue, 17 Jul 2018 13:25:34 -0600
Subject: [PATCH] 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 | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/tools/binman/control.py b/tools/binman/control.py
index ab894a8aa8..3c931d9aeb 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.39.5