Message ID | 20180914105736.162666-23-sjg@chromium.org |
---|---|
State | Accepted |
Commit | b4e1a38c294f56708d1a82717c850da359401d7e |
Delegated to: | Simon Glass |
Headers | show |
Series | binman: Expand support for SPL and TPL | expand |
On 14 September 2018 at 03:57, Simon Glass <sjg@chromium.org> wrote: > At present if there is only a zero-size entry in a section this is > reported as an error, e.g.: > > Offset 0x0 (0) is outside the section starting at 0x0 (0) > > Adjust the logic in CheckEntries() to avoid this. > > Signed-off-by: Simon Glass <sjg@chromium.org> > --- > > tools/binman/bsection.py | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Applied to u-boot-dm, and now in mainline.
diff --git a/tools/binman/bsection.py b/tools/binman/bsection.py index 44adb82795b..1c37d84e99a 100644 --- a/tools/binman/bsection.py +++ b/tools/binman/bsection.py @@ -258,7 +258,7 @@ class Section(object): for entry in self._entries.values(): entry.CheckOffset() if (entry.offset < self._skip_at_start or - entry.offset >= self._skip_at_start + self._size): + entry.offset + entry.size > self._skip_at_start + self._size): entry.Raise("Offset %#x (%d) is outside the section starting " "at %#x (%d)" % (entry.offset, entry.offset, self._skip_at_start,
At present if there is only a zero-size entry in a section this is reported as an error, e.g.: Offset 0x0 (0) is outside the section starting at 0x0 (0) Adjust the logic in CheckEntries() to avoid this. Signed-off-by: Simon Glass <sjg@chromium.org> --- tools/binman/bsection.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)