diff options
| author | Simon Glass <sjg@chromium.org> | 2021-11-23 11:03:45 -0700 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2021-12-02 09:16:30 -0700 |
| commit | 1e99bc2923afa9c7a0e17895eec2d152c9187a80 (patch) | |
| tree | feae1831a6ac42e0194015d3e1c8fe0ad73e23a0 | |
| parent | 557693ef7edaf66c43e709b33e7c98d7371c083c (diff) | |
| download | u-boot-1e99bc2923afa9c7a0e17895eec2d152c9187a80.zip u-boot-1e99bc2923afa9c7a0e17895eec2d152c9187a80.tar.gz u-boot-1e99bc2923afa9c7a0e17895eec2d152c9187a80.tar.bz2 | |
binman: Drop the underscore in _ReadEntries()
This function can be overridden so should not have an underscore. Drop it.
Signed-off-by: Simon Glass <sjg@chromium.org>
| -rw-r--r-- | tools/binman/etype/blob_phase.py | 2 | ||||
| -rw-r--r-- | tools/binman/etype/cbfs.py | 4 | ||||
| -rw-r--r-- | tools/binman/etype/files.py | 2 | ||||
| -rw-r--r-- | tools/binman/etype/section.py | 8 |
4 files changed, 8 insertions, 8 deletions
diff --git a/tools/binman/etype/blob_phase.py b/tools/binman/etype/blob_phase.py index 54ca54c..ed25e46 100644 --- a/tools/binman/etype/blob_phase.py +++ b/tools/binman/etype/blob_phase.py @@ -48,4 +48,4 @@ class Entry_blob_phase(Entry_section): subnode = state.AddSubnode(self._node, name) # Read entries again, now that we have some - self._ReadEntries() + self.ReadEntries() diff --git a/tools/binman/etype/cbfs.py b/tools/binman/etype/cbfs.py index 44db7b9..0a858b8 100644 --- a/tools/binman/etype/cbfs.py +++ b/tools/binman/etype/cbfs.py @@ -171,7 +171,7 @@ class Entry_cbfs(Entry): self._cbfs_arg = fdt_util.GetString(node, 'cbfs-arch', 'x86') self.align_default = None self._cbfs_entries = OrderedDict() - self._ReadSubnodes() + self.ReadEntries() self.reader = None def ObtainContents(self, skip=None): @@ -204,7 +204,7 @@ class Entry_cbfs(Entry): self.SetContents(data) return True - def _ReadSubnodes(self): + def ReadEntries(self): """Read the subnodes to find out what should go in this CBFS""" for node in self._node.subnodes: entry = Entry.Create(self, node) diff --git a/tools/binman/etype/files.py b/tools/binman/etype/files.py index 9b04a49..927d0f0 100644 --- a/tools/binman/etype/files.py +++ b/tools/binman/etype/files.py @@ -64,4 +64,4 @@ class Entry_files(Entry_section): state.AddInt(subnode, 'align', self._files_align) # Read entries again, now that we have some - self._ReadEntries() + self.ReadEntries() diff --git a/tools/binman/etype/section.py b/tools/binman/etype/section.py index e2949fc..281a228 100644 --- a/tools/binman/etype/section.py +++ b/tools/binman/etype/section.py @@ -85,9 +85,9 @@ class Entry_section(Entry): if filename: self._filename = filename - self._ReadEntries() + self.ReadEntries() - def _ReadEntries(self): + def ReadEntries(self): for node in self._node.subnodes: if node.name.startswith('hash') or node.name.startswith('signature'): continue @@ -741,5 +741,5 @@ class Entry_section(Entry): missing: List of missing properties / entry args, each a string """ if not self._ignore_missing: - entry.Raise('Missing required properties/entry args: %s' % - (', '.join(missing))) + missing = ', '.join(missing) + entry.Raise(f'Missing required properties/entry args: {missing}') |