binman: Drop Entry.CheckOffset()

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>

diff --git a/tools/binman/entry.py b/tools/binman/entry.py
index 8fa1dcef2da0dc282b834b94c112389be40c877d..8946d2bc02f44c8b4b37dfa2cf06207d37c77749 100644 (file)
--- a/tools/binman/entry.py
+++ b/tools/binman/entry.py
@@ -520,7 +520,7 @@ class Entry(object):
         """
         pass
 
-    def CheckOffset(self):
+    def CheckEntries(self):
         """Check that the entry offsets are correct
 
         This is used for entries which have extra offset requirements (other

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