Revert "Merge tag 'dm-pull-20jul20' of git://git.denx.de/u-boot-dm"
This reverts commit 5d3a21df6694ebd66d5c34c9d62a26edc7456fc7, reversing
changes made to 56d37f1c564107e27d873181d838571b7d7860e7.
Unfortunately this is causing CI failures:
https://travis-ci.org/github/trini/u-boot/jobs/711313649
Signed-off-by: Tom Rini <trini@konsulko.com>
diff --git a/tools/binman/image.py b/tools/binman/image.py
index a8772c3..523b274 100644
--- a/tools/binman/image.py
+++ b/tools/binman/image.py
@@ -45,7 +45,7 @@
we create a section manually.
"""
def __init__(self, name, node, copy_to_orig=True, test=False):
- super().__init__(None, 'section', node, test=test)
+ section.Entry_section.__init__(self, None, 'section', node, test=test)
self.copy_to_orig = copy_to_orig
self.name = 'main-section'
self.image_name = name
@@ -57,7 +57,7 @@
self.ReadNode()
def ReadNode(self):
- super().ReadNode()
+ section.Entry_section.ReadNode(self)
filename = fdt_util.GetString(self._node, 'filename')
if filename:
self._filename = filename
@@ -116,11 +116,11 @@
def PackEntries(self):
"""Pack all entries into the image"""
- super().Pack(0)
+ section.Entry_section.Pack(self, 0)
def SetImagePos(self):
# This first section in the image so it starts at 0
- super().SetImagePos(0)
+ section.Entry_section.SetImagePos(self, 0)
def ProcessEntryContents(self):
"""Call the ProcessContents() method for each entry
@@ -139,7 +139,7 @@
def WriteSymbols(self):
"""Write symbol values into binary files for access at run time"""
- super().WriteSymbols(self)
+ section.Entry_section.WriteSymbols(self, self)
def BuildImage(self):
"""Write the image to a file"""
@@ -161,7 +161,7 @@
with open(fname, 'w') as fd:
print('%8s %8s %8s %s' % ('ImagePos', 'Offset', 'Size', 'Name'),
file=fd)
- super().WriteMap(fd, 0)
+ section.Entry_section.WriteMap(self, fd, 0)
return fname
def BuildEntryList(self):