binman: Rename state.GetFdts()
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>
This commit is contained in:
@@ -231,7 +231,7 @@ def PrepareImagesAndDtbs(dtb_fname, select_images, update_fdt):
|
|||||||
image.AddMissingProperties()
|
image.AddMissingProperties()
|
||||||
image.ProcessFdt(dtb)
|
image.ProcessFdt(dtb)
|
||||||
|
|
||||||
for dtb_item in state.GetFdts():
|
for dtb_item in state.GetAllFdts():
|
||||||
dtb_item.Sync(auto_resize=True)
|
dtb_item.Sync(auto_resize=True)
|
||||||
dtb_item.Pack()
|
dtb_item.Pack()
|
||||||
dtb_item.Flush()
|
dtb_item.Flush()
|
||||||
@@ -278,7 +278,7 @@ def ProcessImage(image, update_fdt, write_map):
|
|||||||
image.SetImagePos()
|
image.SetImagePos()
|
||||||
if update_fdt:
|
if update_fdt:
|
||||||
image.SetCalculatedProperties()
|
image.SetCalculatedProperties()
|
||||||
for dtb_item in state.GetFdts():
|
for dtb_item in state.GetAllFdts():
|
||||||
dtb_item.Sync()
|
dtb_item.Sync()
|
||||||
sizes_ok = image.ProcessEntryContents()
|
sizes_ok = image.ProcessEntryContents()
|
||||||
if sizes_ok:
|
if sizes_ok:
|
||||||
@@ -355,7 +355,7 @@ def Binman(args):
|
|||||||
ProcessImage(image, args.update_fdt, args.map)
|
ProcessImage(image, args.update_fdt, args.map)
|
||||||
|
|
||||||
# Write the updated FDTs to our output files
|
# 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())
|
tools.WriteFile(dtb_item._fname, dtb_item.GetContents())
|
||||||
|
|
||||||
finally:
|
finally:
|
||||||
|
|||||||
@@ -117,8 +117,8 @@ def GetEntryArg(name):
|
|||||||
def Prepare(images, dtb):
|
def Prepare(images, dtb):
|
||||||
"""Get device tree files ready for use
|
"""Get device tree files ready for use
|
||||||
|
|
||||||
This sets up a set of device tree files that can be retrieved by GetFdts().
|
This sets up a set of device tree files that can be retrieved by
|
||||||
At present there is only one, that for U-Boot proper.
|
GetAllFdts(). This includes U-Boot proper and any SPL device trees.
|
||||||
|
|
||||||
Args:
|
Args:
|
||||||
images: List of images being used
|
images: List of images being used
|
||||||
@@ -152,7 +152,7 @@ def Prepare(images, dtb):
|
|||||||
other_dtb = fdt.FdtScan(out_fname)
|
other_dtb = fdt.FdtScan(out_fname)
|
||||||
fdt_files[other_fname] = other_dtb
|
fdt_files[other_fname] = other_dtb
|
||||||
|
|
||||||
def GetFdts():
|
def GetAllFdts():
|
||||||
"""Yield all device tree files being used by binman
|
"""Yield all device tree files being used by binman
|
||||||
|
|
||||||
Yields:
|
Yields:
|
||||||
|
|||||||
Reference in New Issue
Block a user