@@ -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:
@@ -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:
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(-)