From: Simon Glass <sjg@chromium.org>
Date: Wed, 25 Sep 2019 14:56:22 +0000 (-0600)
Subject: binman: Take account of skip-at-start with image-header
X-Git-Tag: v2020.01-rc1~35^2~22
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=0b7ebee38e5d9167360bc756fcfb72af8badc74f;p=oweals%2Fu-boot.git

binman: Take account of skip-at-start with image-header

The image-header currently sets it offset assuming that skip-at-start is
zero. This does not work on x86 where offsets end at 4GB. Add in this
value so that the offset is correct.

Signed-off-by: Simon Glass <sjg@chromium.org>
Acked-by: Bin Meng <bmeng.cn@gmail.com>
---

diff --git a/tools/binman/etype/image_header.py b/tools/binman/etype/image_header.py
index 4b69eda1a2..b9327dd799 100644
--- a/tools/binman/etype/image_header.py
+++ b/tools/binman/etype/image_header.py
@@ -100,6 +100,7 @@ class Entry_image_header(Entry):
                     offset = offset
                 else:
                     offset = image_size - IMAGE_HEADER_LEN
+        offset += self.section.GetStartOffset()
         return Entry.Pack(self, offset)
 
     def ProcessContents(self):