colin/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

binman: Drop Entry.CheckOffset()

Browse Source 
This function just calls CheckEntries() in the only non-trivial
implementation. Drop it and use CheckEntries() directly.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass
2020-10-26 17:40:18 -06:00
parent a9fad07d4b
commit 6ddd61131f
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/binman/entry.py
View File

@@ -520,7 +520,7 @@ class Entry(object):
""" """
pass pass
def CheckOffset(self): def CheckEntries(self):
"""Check that the entry offsets are correct """Check that the entry offsets are correct
This is used for entries which have extra offset requirements (other This is used for entries which have extra offset requirements (other

5
tools/binman/etype/section.py
View File

@@ -296,7 +296,7 @@ class Entry_section(Entry):
offset = 0 offset = 0
prev_name = 'None' prev_name = 'None'
for entry in self._entries.values(): for entry in self._entries.values():
entry.CheckOffset() entry.CheckEntries()
if (entry.offset < self._skip_at_start or if (entry.offset < self._skip_at_start or
entry.offset + entry.size > self._skip_at_start + entry.offset + entry.size > self._skip_at_start +
self.size): self.size):
@@ -337,9 +337,6 @@ class Entry_section(Entry):
sizes_ok = False sizes_ok = False
return sizes_ok and sizes_ok_base return sizes_ok and sizes_ok_base
def CheckOffset(self):
self.CheckEntries()
def WriteMap(self, fd, indent): def WriteMap(self, fd, indent):
"""Write a map of the section to a .map file """Write a map of the section to a .map file