diff options
| author | Simon Glass <sjg@chromium.org> | 2019-07-20 12:23:30 -0600 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2019-07-29 09:38:05 -0600 |
| commit | 726e2961291dec2c46d773866c5923210c3bac0f (patch) | |
| tree | a770a1fe285964278971add4f11bff75934bc508 /tools/binman | |
| parent | 4bdd1159805d99888ca60aa63efefbbd307f0cf2 (diff) | |
| download | u-boot-726e2961291dec2c46d773866c5923210c3bac0f.tar.gz u-boot-726e2961291dec2c46d773866c5923210c3bac0f.tar.bz2 u-boot-726e2961291dec2c46d773866c5923210c3bac0f.zip | |
binman: Rename state.GetFdt()
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>
Diffstat (limited to 'tools/binman')
| -rw-r--r-- | tools/binman/etype/u_boot_dtb_with_ucode.py | 2 | ||||
| -rw-r--r-- | tools/binman/state.py | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/tools/binman/etype/u_boot_dtb_with_ucode.py b/tools/binman/etype/u_boot_dtb_with_ucode.py index 188888e022..9224004efe 100644 --- a/tools/binman/etype/u_boot_dtb_with_ucode.py +++ b/tools/binman/etype/u_boot_dtb_with_ucode.py @@ -54,7 +54,7 @@ class Entry_u_boot_dtb_with_ucode(Entry_blob_dtb): # Remove the microcode fname = self.GetDefaultFilename() - fdt = state.GetFdt(fname) + fdt = state.GetFdtForEtype(fname) self.ucode = fdt.GetNode('/microcode') if not self.ucode: raise self.Raise("No /microcode node found in '%s'" % fname) diff --git a/tools/binman/state.py b/tools/binman/state.py index 77c7024f5a..c8175a3033 100644 --- a/tools/binman/state.py +++ b/tools/binman/state.py @@ -33,7 +33,7 @@ main_dtb = None # Entry.ProcessContentsUpdate() allow_entry_expansion = True -def GetFdt(fname): +def GetFdtForEtype(fname): """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 @@ -51,7 +51,8 @@ def GetFdt(fname): def GetFdtPath(fname): """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: 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: pathname = GetFdtPath(fname) - data = GetFdt(fname).GetContents() + data = GetFdtForEtype(fname).GetContents() else: pathname = tools.GetInputFilename(fname) data = tools.ReadFile(pathname) |