imgtool: fix header padding value check

Commit 9117fded47 added support for
supplying an `--erased-val`, which defaults to 0xff. When padding a
header, the checks were still validating against 0, which is the
value used for padding by the Zephyr build system. Now when the
user passes `--pad-header` this check is skipped (we already know
the contents).

Signed-off-by: Fabio Utzig <utzig@apache.org>
This commit is contained in:
Fabio Utzig 2019-10-23 11:00:27 -03:00 committed by Fabio Utzig
parent d0ca0ffc27
commit f5556c3eba
1 changed files with 1 additions and 1 deletions

View File

@ -197,7 +197,7 @@ class Image():
"""Perform some sanity checking of the image.""" """Perform some sanity checking of the image."""
# If there is a header requested, make sure that the image # If there is a header requested, make sure that the image
# starts with all zeros. # starts with all zeros.
if self.header_size > 0: if self.header_size > 0 and not self.pad_header:
if any(v != 0 for v in self.payload[0:self.header_size]): if any(v != 0 for v in self.payload[0:self.header_size]):
raise Exception("Padding requested, but image does not start with zeros") raise Exception("Padding requested, but image does not start with zeros")
if self.slot_size > 0: if self.slot_size > 0: