OrgZephyr/mcuboot
OrgZephyr
/
mcuboot
mirror of https://github.com/zephyrproject-rtos/mcuboot.git
1
0
Fork 0
Code Issues Releases Wiki Activity

imgtool: fix passing --erased-val with 0xff value 

The `--erased-val` (or `-R`) option was doing conversion of base 10, so
the only value that was acceptable was 0. Although not passing this
option would result in the default `0xff` being used, this fixes the
issue by allowing Python to auto-detects the base from string.

Signed-off-by: Fabio Utzig <utzig@apache.org>
This commit is contained in:
Fabio Utzig 2020-02-07 12:01:39 -03:00 committed by Fabio Utzig
parent 970840ccf5
commit cb0807355c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/imgtool/image.py
View File

@ -118,7 +118,7 @@ class Image():
def __init__(self, version=None, header_size=IMAGE_HEADER_SIZE, def __init__(self, version=None, header_size=IMAGE_HEADER_SIZE,
pad_header=False, pad=False, align=1, slot_size=0, pad_header=False, pad=False, align=1, slot_size=0,
max_sectors=DEFAULT_MAX_SECTORS, overwrite_only=False, max_sectors=DEFAULT_MAX_SECTORS, overwrite_only=False,
endian="little", load_addr=0, erased_val=0xff, endian="little", load_addr=0, erased_val=None,
save_enctlv=False): save_enctlv=False):
self.version = version or versmod.decode_version("0") self.version = version or versmod.decode_version("0")
self.header_size = header_size self.header_size = header_size
@ -131,7 +131,7 @@ class Image():
self.endian = endian self.endian = endian
self.base_addr = None self.base_addr = None
self.load_addr = 0 if load_addr is None else load_addr self.load_addr = 0 if load_addr is None else load_addr
self.erased_val = 0xff if erased_val is None else int(erased_val) self.erased_val = 0xff if erased_val is None else int(erased_val, 0)
self.payload = [] self.payload = []
self.enckey = None self.enckey = None
self.save_enctlv = save_enctlv self.save_enctlv = save_enctlv