diff options
author | Tom Rini <trini@konsulko.com> | 2020-07-27 11:15:37 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2020-07-27 11:15:37 -0400 |
commit | 4e05c167a756cbfb0a51ef09e52c8b5c7c4d6514 (patch) | |
tree | 0bcde687838471c17d331106b865eb4361237ed8 /tools/binman/etype/cbfs.py | |
parent | 117c7ee283f1c3f49306fb11939b59fe11cbf5a8 (diff) | |
parent | 347e0f00e850028b4595287d5158c5a8f36ba910 (diff) | |
download | u-boot-4e05c167a756cbfb0a51ef09e52c8b5c7c4d6514.zip u-boot-4e05c167a756cbfb0a51ef09e52c8b5c7c4d6514.tar.gz u-boot-4e05c167a756cbfb0a51ef09e52c8b5c7c4d6514.tar.bz2 |
Merge tag 'dm-pull-20jul20-take2a' of https://gitlab.denx.de/u-boot/custodians/u-boot-dm
binman support for FIT
new UCLASS_SOC
patman switch 'test' command
minor fdt fixes
patman usability improvements
Diffstat (limited to 'tools/binman/etype/cbfs.py')
-rw-r--r-- | tools/binman/etype/cbfs.py | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/tools/binman/etype/cbfs.py b/tools/binman/etype/cbfs.py index e9aed83..650ab2c 100644 --- a/tools/binman/etype/cbfs.py +++ b/tools/binman/etype/cbfs.py @@ -167,7 +167,7 @@ class Entry_cbfs(Entry): global state from binman import state - Entry.__init__(self, section, etype, node) + super().__init__(section, etype, node) self._cbfs_arg = fdt_util.GetString(node, 'cbfs-arch', 'x86') self._cbfs_entries = OrderedDict() self._ReadSubnodes() @@ -204,7 +204,7 @@ class Entry_cbfs(Entry): return True def _ReadSubnodes(self): - """Read the subnodes to find out what should go in this IFWI""" + """Read the subnodes to find out what should go in this CBFS""" for node in self._node.subnodes: entry = Entry.Create(self, node) entry.ReadNode() @@ -226,7 +226,7 @@ class Entry_cbfs(Entry): Args: image_pos: Position of this entry in the image """ - Entry.SetImagePos(self, image_pos) + super().SetImagePos(image_pos) # Now update the entries with info from the CBFS entries for entry in self._cbfs_entries.values(): @@ -238,7 +238,7 @@ class Entry_cbfs(Entry): entry.uncomp_size = cfile.memlen def AddMissingProperties(self): - Entry.AddMissingProperties(self) + super().AddMissingProperties() for entry in self._cbfs_entries.values(): entry.AddMissingProperties() if entry._cbfs_compress: @@ -250,7 +250,7 @@ class Entry_cbfs(Entry): def SetCalculatedProperties(self): """Set the value of device-tree properties calculated by binman""" - Entry.SetCalculatedProperties(self) + super().SetCalculatedProperties() for entry in self._cbfs_entries.values(): state.SetInt(entry._node, 'offset', entry.offset) state.SetInt(entry._node, 'size', entry.size) @@ -260,7 +260,7 @@ class Entry_cbfs(Entry): def ListEntries(self, entries, indent): """Override this method to list all files in the section""" - Entry.ListEntries(self, entries, indent) + super().ListEntries(entries, indent) for entry in self._cbfs_entries.values(): entry.ListEntries(entries, indent + 1) @@ -268,12 +268,12 @@ class Entry_cbfs(Entry): return self._cbfs_entries def ReadData(self, decomp=True): - data = Entry.ReadData(self, True) + data = super().ReadData(True) return data def ReadChildData(self, child, decomp=True): if not self.reader: - data = Entry.ReadData(self, True) + data = super().ReadData(True) self.reader = cbfs_util.CbfsReader(data) reader = self.reader cfile = reader.files.get(child.name) |