commit e59434158ce514ff3df81a3faabf1b5fca172093
author Simon Glass <sjg@chromium.org> Sat Aug 24 07:23:12 2019 -0600
committer Simon Glass <sjg@chromium.org> Tue Oct 15 08:40:02 2019 -0600
tree 5744bd7a7cdeaf5330887e2b2169d18239c59402
parent 59589a9f11854a238ced4ec6fb3c995dc231ca1c

binman: Write symbol info before image inclusion

At present the symbol information is written to binaries just before
binman exits. This is fine for entries within sections since the section
contents is calculated when it is needed, so the updated symbol values are
included in the image that is written.

However some binaries are inside entries which have already generated
their contents and do not notice that the entries have changed (e.g. Intel
IFWI).

Move the symbol writing earlier to cope with this.

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

tools/binman/control.py

diff --git a/tools/binman/control.py b/tools/binman/control.py
index 8268eda..fe24b2a 100644
--- a/tools/binman/control.py
+++ b/tools/binman/control.py
@@ -437,6 +437,7 @@
             for dtb_item in state.GetAllFdts():
                 dtb_item.Sync()
                 dtb_item.Flush()
+        image.WriteSymbols()
         sizes_ok = image.ProcessEntryContents()
         if sizes_ok:
             break
@@ -445,7 +446,6 @@
         image.Raise('Entries changed size after packing (tried %s passes)' %
                     passes)
 
-    image.WriteSymbols()
     image.BuildImage()
     if write_map:
         image.WriteMap()