commit bd668e3e27bf0ff155c72490359dffcd2fad3698
author Simon Glass <sjg@chromium.org> Mon Oct 26 17:40:19 2020 -0600
committer Simon Glass <sjg@chromium.org> Thu Oct 29 14:42:59 2020 -0600
tree 058e65fc946792f3e913b86edf4e6f7da7ae69c9
parent 55f68077197d52d5db635741ff51b48e7d6867ea

binman: Move sort and expand to the main Pack() function

At present sorting and expanding entries are side-effects of the
CheckEntries() function. This is a bit confusing, as 'checking' would
not normally involve making changes.

Move these steps into the Pack() function instead.

Signed-off-by: Simon Glass <sjg@chromium.org>

tools/binman/etype/section.py

diff --git a/tools/binman/etype/section.py b/tools/binman/etype/section.py
index fb4bf64..c883f0d 100644
--- a/tools/binman/etype/section.py
+++ b/tools/binman/etype/section.py
@@ -260,6 +260,10 @@
     def Pack(self, offset):
         """Pack all entries into the section"""
         self._PackEntries()
+        if self._sort:
+            self._SortEntries()
+        self._ExpandEntries()
+
         return super().Pack(offset)
 
     def _PackEntries(self):
@@ -290,9 +294,6 @@
 
     def CheckEntries(self):
         """Check that entries do not overlap or extend outside the section"""
-        if self._sort:
-            self._SortEntries()
-        self._ExpandEntries()
         offset = 0
         prev_name = 'None'
         for entry in self._entries.values():