Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2025-02-16 14:08:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

binman: Use super() instead of specifying parent type

Browse source 
It is easier and less error-prone to use super() when the parent type is
needed. Update binman to remove the type names.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
This commit is contained in:
Simon Glass 2020-07-09 18:39:35 -06:00
parent 73bc9e2e21
commit 34861d506c
57 changed files with 86 additions and 87 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tools/binman/etype/_testing.py
View file

@ -41,10 +41,10 @@ class Entry__testing(Entry):
data type (generating an error)
"""
def __init__(self, section, etype, node):
Entry.__init__(self, section, etype, node)
super().__init__(section, etype, node)
def ReadNode(self):
Entry.ReadNode(self)
super().ReadNode()
self.return_invalid_entry = fdt_util.GetBool(self._node,
'return-invalid-entry')
self.return_unknown_contents = fdt_util.GetBool(self._node,

2
tools/binman/etype/blob.py
View file

@ -31,7 +31,7 @@ class Entry_blob(Entry):
data.
"""
def __init__(self, section, etype, node):
Entry.__init__(self, section, etype, node)
super().__init__(section, etype, node)
self._filename = fdt_util.GetString(self._node, 'filename', self.etype)
self.compress = fdt_util.GetString(self._node, 'compress', 'none')

6
tools/binman/etype/blob_dtb.py
View file

@ -20,13 +20,13 @@ class Entry_blob_dtb(Entry_blob):
global state
from binman import state
Entry_blob.__init__(self, section, etype, node)
super().__init__(section, etype, node)
def ObtainContents(self):
"""Get the device-tree from the list held by the 'state' module"""
self._filename = self.GetDefaultFilename()
self._pathname, _ = state.GetFdtContents(self.GetFdtEtype())
return Entry_blob.ReadBlobContents(self)
return super().ReadBlobContents()
def ProcessContents(self):
"""Re-read the DTB contents so that we get any calculated properties"""
@ -57,7 +57,7 @@ class Entry_blob_dtb(Entry_blob):
return {self.GetFdtEtype(): [self, fname]}
def WriteData(self, data, decomp=True):
ok = Entry_blob.WriteData(self, data, decomp)
ok = super().WriteData(data, decomp)
# Update the state module, since it has the authoritative record of the
# device trees used. If we don't do this, then state.GetFdtContents()

2
tools/binman/etype/blob_named_by_arg.py
View file

@ -29,6 +29,6 @@ class Entry_blob_named_by_arg(Entry_blob):
See cros_ec_rw for an example of this.
"""
def __init__(self, section, etype, node, blob_fname):
Entry_blob.__init__(self, section, etype, node)
super().__init__(section, etype, node)
self._filename, = self.GetEntryArgsOrProps(
[EntryArg('%s-path' % blob_fname, str)])

14
tools/binman/etype/cbfs.py
View file

@ -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()
@ -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)

3
tools/binman/etype/cros_ec_rw.py
View file

@ -18,5 +18,4 @@ class Entry_cros_ec_rw(Entry_blob_named_by_arg):
updating the EC on startup via software sync.
"""
def __init__(self, section, etype, node):
Entry_blob_named_by_arg.__init__(self, section, etype, node,
'cros-ec-rw')
super().__init__(section, etype, node, 'cros-ec-rw')

2
tools/binman/etype/fdtmap.py
View file

@ -85,7 +85,7 @@ class Entry_fdtmap(Entry):
from binman import state
from dtoc.fdt import Fdt
Entry.__init__(self, section, etype, node)
super().__init__(section, etype, node)
def _GetFdtmap(self):
"""Build an FDT map from the entries in the current image

2
tools/binman/etype/files.py
View file

@ -32,7 +32,7 @@ class Entry_files(Entry_section):
global state
from binman import state
Entry_section.__init__(self, section, etype, node)
super().__init__(section, etype, node)
self._pattern = fdt_util.GetString(self._node, 'pattern')
if not self._pattern:
self.Raise("Missing 'pattern' property")

4
tools/binman/etype/fill.py
View file

@ -22,10 +22,10 @@ class Entry_fill(Entry):
byte value of a region.
"""
def __init__(self, section, etype, node):
Entry.__init__(self, section, etype, node)
super().__init__(section, etype, node)
def ReadNode(self):
Entry.ReadNode(self)
super().ReadNode()
if self.size is None:
self.Raise("'fill' entry must have a size property")
self.fill_value = fdt_util.GetByte(self._node, 'fill-byte', 0)

2
tools/binman/etype/fmap.py
View file

@ -32,7 +32,7 @@ class Entry_fmap(Entry):
the sub-entries are ignored.
"""
def __init__(self, section, etype, node):
Entry.__init__(self, section, etype, node)
super().__init__(section, etype, node)
def _GetFmap(self):
"""Build an FMAP from the entries in the current image

2
tools/binman/etype/gbb.py
View file

@ -54,7 +54,7 @@ class Entry_gbb(Entry):
README.chromium for how to obtain the required keys and tools.
"""
def __init__(self, section, etype, node):
Entry.__init__(self, section, etype, node)
super().__init__(section, etype, node)
self.hardware_id, self.keydir, self.bmpblk = self.GetEntryArgsOrProps(
[EntryArg('hardware-id', str),
EntryArg('keydir', str),

4
tools/binman/etype/image_header.py
View file

@ -57,7 +57,7 @@ class Entry_image_header(Entry):
first/last in the entry list.
"""
def __init__(self, section, etype, node):
Entry.__init__(self, section, etype, node)
super().__init__(section, etype, node)
self.location = fdt_util.GetString(self._node, 'location')
def _GetHeader(self):
@ -101,7 +101,7 @@ class Entry_image_header(Entry):
else:
offset = image_size - IMAGE_HEADER_LEN
offset += self.section.GetStartOffset()
return Entry.Pack(self, offset)
return super().Pack(offset)
def ProcessContents(self):
"""Write an updated version of the FDT map to this entry

2
tools/binman/etype/intel_cmc.py
View file

@ -20,4 +20,4 @@ class Entry_intel_cmc(Entry_blob):
See README.x86 for information about x86 binary blobs.
"""
def __init__(self, section, etype, node):
Entry_blob.__init__(self, section, etype, node)
super().__init__(section, etype, node)

4
tools/binman/etype/intel_descriptor.py
View file

@ -45,14 +45,14 @@ class Entry_intel_descriptor(Entry_blob):
See README.x86 for information about x86 binary blobs.
"""
def __init__(self, section, etype, node):
Entry_blob.__init__(self, section, etype, node)
super().__init__(section, etype, node)
self._regions = []
def Pack(self, offset):
"""Put this entry at the start of the image"""
if self.offset is None:
offset = self.section.GetStartOffset()
return Entry_blob.Pack(self, offset)
return super().Pack(offset)
def GetOffsets(self):
offset = self.data.find(FD_SIGNATURE)

4
tools/binman/etype/intel_fit.py
View file

@ -19,11 +19,11 @@ class Entry_intel_fit(Entry_blob):
At present binman only supports a basic FIT with no microcode.
"""
def __init__(self, section, etype, node):
Entry_blob.__init__(self, section, etype, node)
super().__init__(section, etype, node)
def ReadNode(self):
"""Force 16-byte alignment as required by FIT pointer"""
Entry_blob.ReadNode(self)
super().ReadNode()
self.align = 16
def ObtainContents(self):

4
tools/binman/etype/intel_fit_ptr.py
View file

@ -16,7 +16,7 @@ class Entry_intel_fit_ptr(Entry_blob):
0xffffffc0 in the image.
"""
def __init__(self, section, etype, node):
Entry_blob.__init__(self, section, etype, node)
super().__init__(section, etype, node)
if self.HasSibling('intel-fit') is False:
self.Raise("'intel-fit-ptr' section must have an 'intel-fit' sibling")
@ -38,4 +38,4 @@ class Entry_intel_fit_ptr(Entry_blob):
def Pack(self, offset):
"""Special pack method to set the offset to the right place"""
return Entry_blob.Pack(self, 0xffffffc0)
return super().Pack(0xffffffc0)

2
tools/binman/etype/intel_fsp.py
View file

@ -24,4 +24,4 @@ class Entry_intel_fsp(Entry_blob):
See README.x86 for information about x86 binary blobs.
"""
def __init__(self, section, etype, node):
Entry_blob.__init__(self, section, etype, node)
super().__init__(section, etype, node)

2
tools/binman/etype/intel_fsp_m.py
View file

@ -24,4 +24,4 @@ class Entry_intel_fsp_m(Entry_blob):
See README.x86 for information about x86 binary blobs.
"""
def __init__(self, section, etype, node):
Entry_blob.__init__(self, section, etype, node)
super().__init__(section, etype, node)

2
tools/binman/etype/intel_fsp_s.py
View file

@ -24,4 +24,4 @@ class Entry_intel_fsp_s(Entry_blob):
See README.x86 for information about x86 binary blobs.
"""
def __init__(self, section, etype, node):
Entry_blob.__init__(self, section, etype, node)
super().__init__(section, etype, node)

2
tools/binman/etype/intel_fsp_t.py
View file

@ -23,4 +23,4 @@ class Entry_intel_fsp_t(Entry_blob):
See README.x86 for information about x86 binary blobs.
"""
def __init__(self, section, etype, node):
Entry_blob.__init__(self, section, etype, node)
super().__init__(section, etype, node)

4
tools/binman/etype/intel_ifwi.py
View file

@ -45,13 +45,13 @@ class Entry_intel_ifwi(Entry_blob):
See README.x86 for information about x86 binary blobs.
"""
def __init__(self, section, etype, node):
Entry_blob.__init__(self, section, etype, node)
super().__init__(section, etype, node)
self._convert_fit = fdt_util.GetBool(self._node, 'convert-fit')
self._ifwi_entries = OrderedDict()
def ReadNode(self):
self._ReadSubnodes()
Entry_blob.ReadNode(self)
super().ReadNode()
def _BuildIfwi(self):
"""Build the contents of the IFWI and write it to the 'data' property"""

2
tools/binman/etype/intel_me.py
View file

@ -27,4 +27,4 @@ class Entry_intel_me(Entry_blob):
See README.x86 for information about x86 binary blobs.
"""
def __init__(self, section, etype, node):
Entry_blob.__init__(self, section, etype, node)
super().__init__(section, etype, node)

2
tools/binman/etype/intel_mrc.py
View file

@ -21,7 +21,7 @@ class Entry_intel_mrc(Entry_blob):
See README.x86 for information about x86 binary blobs.
"""
def __init__(self, section, etype, node):
Entry_blob.__init__(self, section, etype, node)
super().__init__(section, etype, node)
def GetDefaultFilename(self):
return 'mrc.bin'

2
tools/binman/etype/intel_refcode.py
View file

@ -21,7 +21,7 @@ class Entry_intel_refcode(Entry_blob):
See README.x86 for information about x86 binary blobs.
"""
def __init__(self, section, etype, node):
Entry_blob.__init__(self, section, etype, node)
super().__init__(section, etype, node)
def GetDefaultFilename(self):
return 'refcode.bin'

2
tools/binman/etype/intel_vbt.py
View file

@ -19,4 +19,4 @@ class Entry_intel_vbt(Entry_blob):
See README.x86 for information about Intel binary blobs.
"""
def __init__(self, section, etype, node):
Entry_blob.__init__(self, section, etype, node)
super().__init__(section, etype, node)

2
tools/binman/etype/intel_vga.py
View file

@ -22,4 +22,4 @@ class Entry_intel_vga(Entry_blob):
See README.x86 for information about Intel binary blobs.
"""
def __init__(self, section, etype, node):
Entry_blob.__init__(self, section, etype, node)
super().__init__(section, etype, node)

2
tools/binman/etype/mkimage.py
View file

@ -33,7 +33,7 @@ class Entry_mkimage(Entry):
binman.
"""
def __init__(self, section, etype, node):
Entry.__init__(self, section, etype, node)
super().__init__(section, etype, node)
self._args = fdt_util.GetString(self._node, 'args').split(' ')
self._mkimage_entries = OrderedDict()
self._ReadSubnodes()

2
tools/binman/etype/powerpc_mpc85xx_bootpg_resetvec.py
View file

@ -19,7 +19,7 @@ class Entry_powerpc_mpc85xx_bootpg_resetvec(Entry_blob):
"""
def __init__(self, section, etype, node):
Entry_blob.__init__(self, section, etype, node)
super().__init__(section, etype, node)
def GetDefaultFilename(self):
return 'u-boot-br.bin'

16
tools/binman/etype/section.py
View file

@ -43,7 +43,7 @@ class Entry_section(Entry):
"""
def __init__(self, section, etype, node, test=False):
if not test:
Entry.__init__(self, section, etype, node)
super().__init__(section, etype, node)
self._entries = OrderedDict()
self._pad_byte = 0
self._sort = False
@ -52,7 +52,7 @@ class Entry_section(Entry):
def ReadNode(self):
"""Read properties from the image node"""
Entry.ReadNode(self)
super().ReadNode()
self._pad_byte = fdt_util.GetInt(self._node, 'pad-byte', 0)
self._sort = fdt_util.GetBool(self._node, 'sort-by-offset')
self._end_4gb = fdt_util.GetBool(self._node, 'end-at-4gb')
@ -126,13 +126,13 @@ class Entry_section(Entry):
a section containing a list of files. Process these entries so that
this information is added to the device tree.
"""
Entry.ExpandEntries(self)
super().ExpandEntries()
for entry in self._entries.values():
entry.ExpandEntries()
def AddMissingProperties(self):
"""Add new properties to the device tree as needed for this entry"""
Entry.AddMissingProperties(self)
super().AddMissingProperties()
for entry in self._entries.values():
entry.AddMissingProperties()
@ -168,14 +168,14 @@ class Entry_section(Entry):
def ResetForPack(self):
"""Reset offset/size fields so that packing can be done again"""
Entry.ResetForPack(self)
super().ResetForPack()
for entry in self._entries.values():
entry.ResetForPack()
def Pack(self, offset):
"""Pack all entries into the section"""
self._PackEntries()
return Entry.Pack(self, offset)
return super().Pack(offset)
def _PackEntries(self):
"""Pack all entries into the image"""
@ -232,12 +232,12 @@ class Entry_section(Entry):
entry.WriteSymbols(self)
def SetCalculatedProperties(self):
Entry.SetCalculatedProperties(self)
super().SetCalculatedProperties()
for entry in self._entries.values():
entry.SetCalculatedProperties()
def SetImagePos(self, image_pos):
Entry.SetImagePos(self, image_pos)
super().SetImagePos(image_pos)
for entry in self._entries.values():
entry.SetImagePos(image_pos + self.offset)

2
tools/binman/etype/text.py
View file

@ -57,7 +57,7 @@ class Entry_text(Entry):
by setting the size of the entry to something larger than the text.
"""
def __init__(self, section, etype, node):
Entry.__init__(self, section, etype, node)
super().__init__(section, etype, node)
value = fdt_util.GetString(self._node, 'text')
if value:
value = tools.ToBytes(value)

2
tools/binman/etype/u_boot.py
View file

@ -26,7 +26,7 @@ class Entry_u_boot(Entry_blob):
in the binman README for more information.
"""
def __init__(self, section, etype, node):
Entry_blob.__init__(self, section, etype, node)
super().__init__(section, etype, node)
def GetDefaultFilename(self):
return 'u-boot.bin'

2
tools/binman/etype/u_boot_dtb.py
View file

@ -22,7 +22,7 @@ class Entry_u_boot_dtb(Entry_blob_dtb):
binman to know which entries contain a device tree.
"""
def __init__(self, section, etype, node):
Entry_blob_dtb.__init__(self, section, etype, node)
super().__init__(section, etype, node)
def GetDefaultFilename(self):
return 'u-boot.dtb'

4
tools/binman/etype/u_boot_dtb_with_ucode.py
View file

@ -28,7 +28,7 @@ class Entry_u_boot_dtb_with_ucode(Entry_blob_dtb):
global state
from binman import state
Entry_blob_dtb.__init__(self, section, etype, node)
super().__init__(section, etype, node)
self.ucode_data = b''
self.collate = False
self.ucode_offset = None
@ -78,7 +78,7 @@ class Entry_u_boot_dtb_with_ucode(Entry_blob_dtb):
def ObtainContents(self):
# Call the base class just in case it does something important.
Entry_blob_dtb.ObtainContents(self)
super().ObtainContents()
if self.ucode and not self.collate:
for node in self.ucode.subnodes:
data_prop = node.props.get('data')

4
tools/binman/etype/u_boot_elf.py
View file

@ -21,7 +21,7 @@ class Entry_u_boot_elf(Entry_blob):
relocated to any address for execution.
"""
def __init__(self, section, etype, node):
Entry_blob.__init__(self, section, etype, node)
super().__init__(section, etype, node)
self._strip = fdt_util.GetBool(self._node, 'strip')
def ReadBlobContents(self):
@ -31,7 +31,7 @@ class Entry_u_boot_elf(Entry_blob):
tools.WriteFile(out_fname, tools.ReadFile(self._pathname))
tools.Run('strip', out_fname)
self._pathname = out_fname
Entry_blob.ReadBlobContents(self)
super().ReadBlobContents()
return True
def GetDefaultFilename(self):

2
tools/binman/etype/u_boot_img.py
View file

@ -21,7 +21,7 @@ class Entry_u_boot_img(Entry_blob):
applications.
"""
def __init__(self, section, etype, node):
Entry_blob.__init__(self, section, etype, node)
super().__init__(section, etype, node)
def GetDefaultFilename(self):
return 'u-boot.img'

2
tools/binman/etype/u_boot_nodtb.py
View file

@ -21,7 +21,7 @@ class Entry_u_boot_nodtb(Entry_blob):
U-Boot and the device tree).
"""
def __init__(self, section, etype, node):
Entry_blob.__init__(self, section, etype, node)
super().__init__(section, etype, node)
def GetDefaultFilename(self):
return 'u-boot-nodtb.bin'

2
tools/binman/etype/u_boot_spl.py
View file

@ -32,7 +32,7 @@ class Entry_u_boot_spl(Entry_blob):
binman uses that to look up symbols to write into the SPL binary.
"""
def __init__(self, section, etype, node):
Entry_blob.__init__(self, section, etype, node)
super().__init__(section, etype, node)
self.elf_fname = 'spl/u-boot-spl'
def GetDefaultFilename(self):

2
tools/binman/etype/u_boot_spl_bss_pad.py
View file

@ -31,7 +31,7 @@ class Entry_u_boot_spl_bss_pad(Entry_blob):
binman uses that to look up the BSS address.
"""
def __init__(self, section, etype, node):
Entry_blob.__init__(self, section, etype, node)
super().__init__(section, etype, node)
def ObtainContents(self):
fname = tools.GetInputFilename('spl/u-boot-spl')

2
tools/binman/etype/u_boot_spl_dtb.py
View file

@ -19,7 +19,7 @@ class Entry_u_boot_spl_dtb(Entry_blob_dtb):
to activate.
"""
def __init__(self, section, etype, node):
Entry_blob_dtb.__init__(self, section, etype, node)
super().__init__(section, etype, node)
def GetDefaultFilename(self):
return 'spl/u-boot-spl.dtb'

2
tools/binman/etype/u_boot_spl_elf.py
View file

@ -18,7 +18,7 @@ class Entry_u_boot_spl_elf(Entry_blob):
be relocated to any address for execution.
"""
def __init__(self, section, etype, node):
Entry_blob.__init__(self, section, etype, node)
super().__init__(section, etype, node)
def GetDefaultFilename(self):
return 'spl/u-boot-spl'

2
tools/binman/etype/u_boot_spl_nodtb.py
View file

@ -22,7 +22,7 @@ class Entry_u_boot_spl_nodtb(Entry_blob):
both SPL and the device tree).
"""
def __init__(self, section, etype, node):
Entry_blob.__init__(self, section, etype, node)
super().__init__(section, etype, node)
def GetDefaultFilename(self):
return 'spl/u-boot-spl-nodtb.bin'

2
tools/binman/etype/u_boot_spl_with_ucode_ptr.py
View file

@ -18,7 +18,7 @@ class Entry_u_boot_spl_with_ucode_ptr(Entry_u_boot_with_ucode_ptr):
process.
"""
def __init__(self, section, etype, node):
Entry_u_boot_with_ucode_ptr.__init__(self, section, etype, node)
super().__init__(section, etype, node)
self.elf_fname = 'spl/u-boot-spl'
def GetDefaultFilename(self):

2
tools/binman/etype/u_boot_tpl.py
View file

@ -32,7 +32,7 @@ class Entry_u_boot_tpl(Entry_blob):
binman uses that to look up symbols to write into the TPL binary.
"""
def __init__(self, section, etype, node):
Entry_blob.__init__(self, section, etype, node)
super().__init__(section, etype, node)
self.elf_fname = 'tpl/u-boot-tpl'
def GetDefaultFilename(self):

2
tools/binman/etype/u_boot_tpl_dtb.py
View file

@ -19,7 +19,7 @@ class Entry_u_boot_tpl_dtb(Entry_blob_dtb):
to activate.
"""
def __init__(self, section, etype, node):
Entry_blob_dtb.__init__(self, section, etype, node)
super().__init__(section, etype, node)
def GetDefaultFilename(self):
return 'tpl/u-boot-tpl.dtb'

2
tools/binman/etype/u_boot_tpl_dtb_with_ucode.py
View file

@ -16,7 +16,7 @@ class Entry_u_boot_tpl_dtb_with_ucode(Entry_u_boot_dtb_with_ucode):
process.
"""
def __init__(self, section, etype, node):
Entry_u_boot_dtb_with_ucode.__init__(self, section, etype, node)
super().__init__(section, etype, node)
def GetDefaultFilename(self):
return 'tpl/u-boot-tpl.dtb'

2
tools/binman/etype/u_boot_tpl_elf.py
View file

@ -18,7 +18,7 @@ class Entry_u_boot_tpl_elf(Entry_blob):
be relocated to any address for execution.
"""
def __init__(self, section, etype, node):
Entry_blob.__init__(self, section, etype, node)
super().__init__(section, etype, node)
def GetDefaultFilename(self):
return 'tpl/u-boot-tpl'

2
tools/binman/etype/u_boot_tpl_with_ucode_ptr.py
View file

@ -20,7 +20,7 @@ class Entry_u_boot_tpl_with_ucode_ptr(Entry_u_boot_with_ucode_ptr):
process.
"""
def __init__(self, section, etype, node):
Entry_u_boot_with_ucode_ptr.__init__(self, section, etype, node)
super().__init__(section, etype, node)
self.elf_fname = 'tpl/u-boot-tpl'
def GetDefaultFilename(self):

2
tools/binman/etype/u_boot_ucode.py
View file

@ -58,7 +58,7 @@ class Entry_u_boot_ucode(Entry_blob):
contents of this entry.
"""
def __init__(self, section, etype, node):
Entry_blob.__init__(self, section, etype, node)
super().__init__(section, etype, node)
def ObtainContents(self):
# If the section does not need microcode, there is nothing to do

2
tools/binman/etype/u_boot_with_ucode_ptr.py
View file

@ -29,7 +29,7 @@ class Entry_u_boot_with_ucode_ptr(Entry_blob):
complicated. Otherwise it is the same as the u_boot entry.
"""
def __init__(self, section, etype, node):
Entry_blob.__init__(self, section, etype, node)
super().__init__(section, etype, node)
self.elf_fname = 'u-boot'
self.target_offset = None

2
tools/binman/etype/vblock.py
View file

@ -36,7 +36,7 @@ class Entry_vblock(Entry):
and kernel are genuine.
"""
def __init__(self, section, etype, node):
Entry.__init__(self, section, etype, node)
super().__init__(section, etype, node)
self.content = fdt_util.GetPhandleList(self._node, 'content')
if not self.content:
self.Raise("Vblock must have a 'content' property")

2
tools/binman/etype/x86_reset16.py
View file

@ -23,7 +23,7 @@ class Entry_x86_reset16(Entry_blob):
For 64-bit U-Boot, the 'x86_reset16_spl' entry type is used instead.
"""
def __init__(self, section, etype, node):
Entry_blob.__init__(self, section, etype, node)
super().__init__(section, etype, node)
def GetDefaultFilename(self):
return 'u-boot-x86-reset16.bin'

2
tools/binman/etype/x86_reset16_spl.py
View file

@ -23,7 +23,7 @@ class Entry_x86_reset16_spl(Entry_blob):
For 32-bit U-Boot, the 'x86_reset_spl' entry type is used instead.
"""
def __init__(self, section, etype, node):
Entry_blob.__init__(self, section, etype, node)
super().__init__(section, etype, node)
def GetDefaultFilename(self):
return 'spl/u-boot-x86-reset16-spl.bin'

2
tools/binman/etype/x86_reset16_tpl.py
View file

@ -23,7 +23,7 @@ class Entry_x86_reset16_tpl(Entry_blob):
For 32-bit U-Boot, the 'x86_reset_tpl' entry type is used instead.
"""
def __init__(self, section, etype, node):
Entry_blob.__init__(self, section, etype, node)
super().__init__(section, etype, node)
def GetDefaultFilename(self):
return 'tpl/u-boot-x86-reset16-tpl.bin'

2
tools/binman/etype/x86_start16.py
View file

@ -25,7 +25,7 @@ class Entry_x86_start16(Entry_blob):
For 64-bit U-Boot, the 'x86_start16_spl' entry type is used instead.
"""
def __init__(self, section, etype, node):
Entry_blob.__init__(self, section, etype, node)
super().__init__(section, etype, node)
def GetDefaultFilename(self):
return 'u-boot-x86-start16.bin'

2
tools/binman/etype/x86_start16_spl.py
View file

@ -25,7 +25,7 @@ class Entry_x86_start16_spl(Entry_blob):
For 32-bit U-Boot, the 'x86-start16' entry type is used instead.
"""
def __init__(self, section, etype, node):
Entry_blob.__init__(self, section, etype, node)
super().__init__(section, etype, node)
def GetDefaultFilename(self):
return 'spl/u-boot-x86-start16-spl.bin'

2
tools/binman/etype/x86_start16_tpl.py
View file

@ -26,7 +26,7 @@ class Entry_x86_start16_tpl(Entry_blob):
may be used instead.
"""
def __init__(self, section, etype, node):
Entry_blob.__init__(self, section, etype, node)
super().__init__(section, etype, node)
def GetDefaultFilename(self):
return 'tpl/u-boot-x86-start16-tpl.bin'

12
tools/binman/image.py
View file

@ -45,7 +45,7 @@ class Image(section.Entry_section):
we create a section manually.
"""
def __init__(self, name, node, copy_to_orig=True, test=False):
section.Entry_section.__init__(self, None, 'section', node, test=test)
super().__init__(None, 'section', node, test=test)
self.copy_to_orig = copy_to_orig
self.name = 'main-section'
self.image_name = name
@ -57,7 +57,7 @@ class Image(section.Entry_section):
self.ReadNode()
def ReadNode(self):
section.Entry_section.ReadNode(self)
super().ReadNode()
filename = fdt_util.GetString(self._node, 'filename')
if filename:
self._filename = filename
@ -116,11 +116,11 @@ class Image(section.Entry_section):
def PackEntries(self):
"""Pack all entries into the image"""
section.Entry_section.Pack(self, 0)
super().Pack(0)
def SetImagePos(self):
# This first section in the image so it starts at 0
section.Entry_section.SetImagePos(self, 0)
super().SetImagePos(0)
def ProcessEntryContents(self):
"""Call the ProcessContents() method for each entry
@ -139,7 +139,7 @@ class Image(section.Entry_section):
def WriteSymbols(self):
"""Write symbol values into binary files for access at run time"""
section.Entry_section.WriteSymbols(self, self)
super().WriteSymbols(self)
def BuildImage(self):
"""Write the image to a file"""
@ -161,7 +161,7 @@ class Image(section.Entry_section):
with open(fname, 'w') as fd:
print('%8s %8s %8s %s' % ('ImagePos', 'Offset', 'Size', 'Name'),
file=fd)
section.Entry_section.WriteMap(self, fd, 0)
super().WriteMap(fd, 0)
return fname
def BuildEntryList(self):