commit 2c360cf73aba4ab5485787c18795536296a75745
author Simon Glass <sjg@chromium.org> Sat Jul 20 12:23:45 2019 -0600
committer Simon Glass <sjg@chromium.org> Mon Jul 29 09:38:05 2019 -0600
tree 9b33ebb2abaac9fb99e6efa541f6555427dbd7fb
parent ee6409b79a1ca40d9976883cfd20dc9f240dce69

binman: Adjust Entry to read the node in a separate call

At present the Entry constructor sets up the object and then immediately
reads its device-tree node to obtain its properties.

This breaks a convention that constructors should not do any processing.
A consequence is that we must pass all arguments to the constructor and
cannot have the node-reading proceed in a different way unless we pass
flags to that constructor. We already have a 'test' flag in a few cases,
and now need to control whether the 'orig_offset' and 'orig_size'
properties are set or not.

Adjust the code to require a separate call to ReadNode() after
construction. The Image class remains as it was.

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

tools/binman/image.py

diff --git a/tools/binman/image.py b/tools/binman/image.py
index 232e752..970d33f 100644
--- a/tools/binman/image.py
+++ b/tools/binman/image.py
@@ -50,9 +50,13 @@
         self.fdtmap_dtb = None
         self.fdtmap_data = None
         if not test:
-            filename = fdt_util.GetString(self._node, 'filename')
-            if filename:
-                self._filename = filename
+            self.ReadNode()
+
+    def ReadNode(self):
+        section.Entry_section.ReadNode(self)
+        filename = fdt_util.GetString(self._node, 'filename')
+        if filename:
+            self._filename = filename
 
     @classmethod
     def FromFile(cls, fname):