[U-Boot,12/53] binman: Drop state.fdt_set as this is not needed
diff mbox series

Message ID 20190720182416.183626-13-sjg@chromium.org
State Accepted
Commit f49462e547495aa314795f77904ee8ca389b3d40
Delegated to: Simon Glass
Headers show
Series
  • binman: Support replacing entries in an existing image
Related show

Commit Message

Simon Glass July 20, 2019, 6:23 p.m. UTC
We can iterate through the output files so don't need this global anymore.
Remove it.

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

 tools/binman/state.py | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

Comments

Simon Glass July 29, 2019, 9:22 p.m. UTC | #1
We can iterate through the output files so don't need this global anymore.
Remove it.

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

 tools/binman/state.py | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

Applied to u-boot-dm, thanks!

Patch
diff mbox series

diff --git a/tools/binman/state.py b/tools/binman/state.py
index 46c1c8d613a..7c3a987723e 100644
--- a/tools/binman/state.py
+++ b/tools/binman/state.py
@@ -28,13 +28,6 @@  entry_args = {}
 # ftest.py)
 use_fake_dtb = False
 
-# Dict of device trees, keyed by entry type. These are the input device trees,
-# before any modification by U-Boot
-# The value is as returned by Entry.GetFdts(), i.e. a tuple:
-#     Fdt object for this dtb, or None if not available
-#     Filename of file containing this dtb
-fdt_set = {}
-
 # The DTB which contains the full image information
 main_dtb = None
 
@@ -136,7 +129,7 @@  def Prepare(images, dtb):
         images: List of images being used
         dtb: Main dtb
     """
-    global fdt_set, output_fdt_files, main_dtb
+    global output_fdt_files, main_dtb
     # Import these here in case libfdt.py is not available, in which case
     # the above help option still works.
     import fdt
@@ -151,8 +144,8 @@  def Prepare(images, dtb):
     output_fdt_files['u-boot-dtb'] = [dtb, 'u-boot.dtb']
     output_fdt_files['u-boot-spl-dtb'] = [dtb, 'spl/u-boot-spl.dtb']
     output_fdt_files['u-boot-tpl-dtb'] = [dtb, 'tpl/u-boot-tpl.dtb']
-    fdt_set = {}
     if not use_fake_dtb:
+        fdt_set = {}
         for image in images.values():
             fdt_set.update(image.GetFdts())
         for etype, other in fdt_set.items():
@@ -172,7 +165,7 @@  def GetAllFdts():
         Device trees being used (U-Boot proper, SPL, TPL)
     """
     yield main_dtb
-    for etype in fdt_set:
+    for etype in output_fdt_files:
         dtb = output_fdt_files[etype][0]
         if dtb != main_dtb:
             yield dtb