dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-02 17:22:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

binman: Rename state.GetFdt()

Browse Source 
This function name conflicts with Fdt.Node.GetFdt() which has a different
purpose. Rename it to avoid confusion.

The new name suggests it is indexed by entry type rather than filename.
This will be tidied up in a future commit.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass
2019-07-20 12:23:30 -06:00
parent 4bdd115980
commit 726e296129
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/binman/etype/u_boot_dtb_with_ucode.py
View File

@@ -54,7 +54,7 @@ class Entry_u_boot_dtb_with_ucode(Entry_blob_dtb):
# Remove the microcode # Remove the microcode
fname = self.GetDefaultFilename() fname = self.GetDefaultFilename()
fdt = state.GetFdt(fname) fdt = state.GetFdtForEtype(fname)
self.ucode = fdt.GetNode('/microcode') self.ucode = fdt.GetNode('/microcode')
if not self.ucode: if not self.ucode:
raise self.Raise("No /microcode node found in '%s'" % fname) raise self.Raise("No /microcode node found in '%s'" % fname)

7
tools/binman/state.py
View File

@@ -33,7 +33,7 @@ main_dtb = None
# Entry.ProcessContentsUpdate() # Entry.ProcessContentsUpdate()
allow_entry_expansion = True allow_entry_expansion = True
def GetFdt(fname): def GetFdtForEtype(fname):
"""Get the Fdt object for a particular device-tree filename """Get the Fdt object for a particular device-tree filename
Binman keeps track of at least one device-tree file called u-boot.dtb but Binman keeps track of at least one device-tree file called u-boot.dtb but
@@ -51,7 +51,8 @@ def GetFdt(fname):
def GetFdtPath(fname): def GetFdtPath(fname):
"""Get the full pathname of a particular Fdt object """Get the full pathname of a particular Fdt object
Similar to GetFdt() but returns the pathname associated with the Fdt. Similar to GetFdtForEtype() but returns the pathname associated with the
Fdt.
Args: Args:
fname: Filename to look up (e.g. 'u-boot.dtb'). fname: Filename to look up (e.g. 'u-boot.dtb').
@@ -78,7 +79,7 @@ def GetFdtContents(fname='u-boot.dtb'):
""" """
if fname in fdt_files and not use_fake_dtb: if fname in fdt_files and not use_fake_dtb:
pathname = GetFdtPath(fname) pathname = GetFdtPath(fname)
data = GetFdt(fname).GetContents() data = GetFdtForEtype(fname).GetContents()
else: else:
pathname = tools.GetInputFilename(fname) pathname = tools.GetInputFilename(fname)
data = tools.ReadFile(pathname) data = tools.ReadFile(pathname)