commit b9fa8579be4dcde3333d83f2fc9ce2e6f3b90dc0
author Simon Glass <sjg@chromium.org> Mon Jul 08 13:18:37 2019 -0600
committer Simon Glass <sjg@chromium.org> Tue Jul 23 20:27:57 2019 -0700
tree 4a6b9eeea69604c3fb25ed59a297505ca36e32ce
parent 40778d71cb23f7a511f9feb142939b2dfc0a68bb

binman: Assume Intel descriptor is at the start of the image

At present binman requires that the Intel descriptor has an explicit
offset. Generally this is 0 since the descriptor is at the start of the
image. Add a default to handle this, so users don't need to specify the
offset.

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

tools/binman/bsection.py

diff --git a/tools/binman/bsection.py b/tools/binman/bsection.py
index e0e3707..49b8ef3 100644
--- a/tools/binman/bsection.py
+++ b/tools/binman/bsection.py
@@ -477,6 +477,14 @@
             return self._parent_section.GetRootSkipAtStart()
         return self._skip_at_start
 
+    def GetStartOffset(self):
+        """Get the start offset for this section
+
+        Returns:
+            The first available offset in this section (typically 0)
+        """
+        return self._skip_at_start
+
     def GetImageSize(self):
         """Get the size of the image containing this section
 

tools/binman/etype/intel_descriptor.py

diff --git a/tools/binman/etype/intel_descriptor.py b/tools/binman/etype/intel_descriptor.py
index 9deb8dc..6610634 100644
--- a/tools/binman/etype/intel_descriptor.py
+++ b/tools/binman/etype/intel_descriptor.py
@@ -47,6 +47,8 @@
     def __init__(self, section, etype, node):
         Entry_blob.__init__(self, section, etype, node)
         self._regions = []
+        if self.offset is None:
+            self.offset = self.section.GetStartOffset()
 
     def GetOffsets(self):
         offset = self.data.find(FD_SIGNATURE)