From: Simon Glass <sjg@chromium.org>
Date: Mon, 26 Oct 2020 23:40:21 +0000 (-0600)
Subject: binman: Call CheckSize() from the section's Pack() method
X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=93f3c2ea1463f5ad4fff9ada8675078d326db347;p=u-boot.git

binman: Call CheckSize() from the section's Pack() method

At present CheckSize() is called from the function that packs the entries.
Move it up to the main Pack() function so that _PackEntries() can just
do the packing.

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

diff --git a/tools/binman/etype/section.py b/tools/binman/etype/section.py
index c883f0d67c..f93469a170 100644
--- a/tools/binman/etype/section.py
+++ b/tools/binman/etype/section.py
@@ -264,6 +264,9 @@ class Entry_section(Entry):
             self._SortEntries()
         self._ExpandEntries()
 
+        size = self.CheckSize()
+        self.size = size
+
         return super().Pack(offset)
 
     def _PackEntries(self):
@@ -271,7 +274,7 @@ class Entry_section(Entry):
         offset = self._skip_at_start
         for entry in self._entries.values():
             offset = entry.Pack(offset)
-        self.size = self.CheckSize()
+        return offset
 
     def _ExpandEntries(self):
         """Expand any entries that are permitted to"""