[U-Boot,07/53] binman: Rename state.GetFdts()
diff mbox series

Message ID 20190720182416.183626-8-sjg@chromium.org
State Accepted
Commit 4bdd1159805d99888ca60aa63efefbbd307f0cf2
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
This function name conflicts with Entry.GetFdts() which has a different
purpose. Rename it to avoid confusion. Also update a stale comment
relating to this function.

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

 tools/binman/control.py | 6 +++---
 tools/binman/state.py   | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

Comments

Simon Glass July 29, 2019, 9:22 p.m. UTC | #1
This function name conflicts with Entry.GetFdts() which has a different
purpose. Rename it to avoid confusion. Also update a stale comment
relating to this function.

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

 tools/binman/control.py | 6 +++---
 tools/binman/state.py   | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

Applied to u-boot-dm, thanks!

Patch
diff mbox series

diff --git a/tools/binman/control.py b/tools/binman/control.py
index de9f29e2246..8700f48ad55 100644
--- a/tools/binman/control.py
+++ b/tools/binman/control.py
@@ -231,7 +231,7 @@  def PrepareImagesAndDtbs(dtb_fname, select_images, update_fdt):
             image.AddMissingProperties()
         image.ProcessFdt(dtb)
 
-    for dtb_item in state.GetFdts():
+    for dtb_item in state.GetAllFdts():
         dtb_item.Sync(auto_resize=True)
         dtb_item.Pack()
         dtb_item.Flush()
@@ -278,7 +278,7 @@  def ProcessImage(image, update_fdt, write_map):
         image.SetImagePos()
         if update_fdt:
             image.SetCalculatedProperties()
-            for dtb_item in state.GetFdts():
+            for dtb_item in state.GetAllFdts():
                 dtb_item.Sync()
         sizes_ok = image.ProcessEntryContents()
         if sizes_ok:
@@ -355,7 +355,7 @@  def Binman(args):
                 ProcessImage(image, args.update_fdt, args.map)
 
             # Write the updated FDTs to our output files
-            for dtb_item in state.GetFdts():
+            for dtb_item in state.GetAllFdts():
                 tools.WriteFile(dtb_item._fname, dtb_item.GetContents())
 
         finally:
diff --git a/tools/binman/state.py b/tools/binman/state.py
index 5b9e005df96..77c7024f5a7 100644
--- a/tools/binman/state.py
+++ b/tools/binman/state.py
@@ -117,8 +117,8 @@  def GetEntryArg(name):
 def Prepare(images, dtb):
     """Get device tree files ready for use
 
-    This sets up a set of device tree files that can be retrieved by GetFdts().
-    At present there is only one, that for U-Boot proper.
+    This sets up a set of device tree files that can be retrieved by
+    GetAllFdts(). This includes U-Boot proper and any SPL device trees.
 
     Args:
         images: List of images being used
@@ -152,7 +152,7 @@  def Prepare(images, dtb):
             other_dtb = fdt.FdtScan(out_fname)
             fdt_files[other_fname] = other_dtb
 
-def GetFdts():
+def GetAllFdts():
     """Yield all device tree files being used by binman
 
     Yields: