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

imgtool: Add --non-bootable flag 

Defaults to false.

Signed-off-by: Mateusz Wielgos <mateusz.wielgos@emerson.com>
This commit is contained in:
Mateusz Wielgos 2024-02-26 15:02:45 -06:00 committed by Jamie
parent aa1f95606e
commit dc03055537
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/imgtool/image.py
View File

@ -159,7 +159,8 @@ class Image:
slot_size=0, max_sectors=DEFAULT_MAX_SECTORS, slot_size=0, max_sectors=DEFAULT_MAX_SECTORS,
overwrite_only=False, endian="little", load_addr=0, overwrite_only=False, endian="little", load_addr=0,
rom_fixed=None, erased_val=None, save_enctlv=False, rom_fixed=None, erased_val=None, save_enctlv=False,
security_counter=None, max_align=None): security_counter=None, max_align=None,
non_bootable=False):
if load_addr and rom_fixed: if load_addr and rom_fixed:
raise click.UsageError("Can not set rom_fixed and load_addr at the same time") raise click.UsageError("Can not set rom_fixed and load_addr at the same time")
@ -183,6 +184,7 @@ class Image:
self.save_enctlv = save_enctlv self.save_enctlv = save_enctlv
self.enctlv_len = 0 self.enctlv_len = 0
self.max_align = max(DEFAULT_MAX_ALIGN, align) if max_align is None else int(max_align) self.max_align = max(DEFAULT_MAX_ALIGN, align) if max_align is None else int(max_align)
self.non_bootable = non_bootable
if self.max_align == DEFAULT_MAX_ALIGN: if self.max_align == DEFAULT_MAX_ALIGN:
self.boot_magic = bytes([ self.boot_magic = bytes([
@ -567,6 +569,8 @@ class Image:
flags |= IMAGE_F['RAM_LOAD'] flags |= IMAGE_F['RAM_LOAD']
if self.rom_fixed: if self.rom_fixed:
flags |= IMAGE_F['ROM_FIXED'] flags |= IMAGE_F['ROM_FIXED']
if self.non_bootable:
flags |= IMAGE_F['NON_BOOTABLE']
e = STRUCT_ENDIAN_DICT[self.endian] e = STRUCT_ENDIAN_DICT[self.endian]
fmt = (e + fmt = (e +

7
scripts/imgtool/main.py
View File

@ -314,6 +314,8 @@ class BasedIntParamType(click.ParamType):
@click.argument('outfile') @click.argument('outfile')
@click.argument('infile') @click.argument('infile')
@click.option('--non-bootable', default=False, is_flag=True,
help='Mark the image as non-bootable.')
@click.option('--custom-tlv', required=False, nargs=2, default=[], @click.option('--custom-tlv', required=False, nargs=2, default=[],
multiple=True, metavar='[tag] [value]', multiple=True, metavar='[tag] [value]',
help='Custom TLV that will be placed into protected area. ' help='Custom TLV that will be placed into protected area. '
@ -411,7 +413,7 @@ def sign(key, public_key_format, align, version, pad_sig, header_size,
endian, encrypt_keylen, encrypt, infile, outfile, dependencies, endian, encrypt_keylen, encrypt, infile, outfile, dependencies,
load_addr, hex_addr, erased_val, save_enctlv, security_counter, load_addr, hex_addr, erased_val, save_enctlv, security_counter,
boot_record, custom_tlv, rom_fixed, max_align, clear, fix_sig, boot_record, custom_tlv, rom_fixed, max_align, clear, fix_sig,
fix_sig_pubkey, sig_out, vector_to_sign): fix_sig_pubkey, sig_out, vector_to_sign, non_bootable):
if confirm: if confirm:
# Confirmed but non-padded images don't make much sense, because # Confirmed but non-padded images don't make much sense, because
@ -423,7 +425,8 @@ def sign(key, public_key_format, align, version, pad_sig, header_size,
max_sectors=max_sectors, overwrite_only=overwrite_only, max_sectors=max_sectors, overwrite_only=overwrite_only,
endian=endian, load_addr=load_addr, rom_fixed=rom_fixed, endian=endian, load_addr=load_addr, rom_fixed=rom_fixed,
erased_val=erased_val, save_enctlv=save_enctlv, erased_val=erased_val, save_enctlv=save_enctlv,
security_counter=security_counter, max_align=max_align) security_counter=security_counter, max_align=max_align,
non_bootable=non_bootable)
img.load(infile) img.load(infile)
key = load_key(key) if key else None key = load_key(key) if key else None
enckey = load_key(encrypt) if encrypt else None enckey = load_key(encrypt) if encrypt else None