From: Simon Glass <sjg@chromium.org>
Date: Sat, 24 Aug 2019 13:23:12 +0000 (-0600)
Subject: binman: Write symbol info before image inclusion
X-Git-Url: http://git.dujemihanovic.xyz/login.html?a=commitdiff_plain;h=261cbe0b3716737e328481b6f3f51cfcb7f13e31;p=u-boot.git

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>
---

diff --git a/tools/binman/control.py b/tools/binman/control.py
index 8268eda37e..fe24b2a6a7 100644
--- a/tools/binman/control.py
+++ b/tools/binman/control.py
@@ -437,6 +437,7 @@ def ProcessImage(image, update_fdt, write_map, get_contents=True,
             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 @@ def ProcessImage(image, update_fdt, write_map, get_contents=True,
         image.Raise('Entries changed size after packing (tried %s passes)' %
                     passes)
 
-    image.WriteSymbols()
     image.BuildImage()
     if write_map:
         image.WriteMap()