Fixed default and made max-align consistent with other options.

Adding required sign-off.

Signed-off-by: Kristine Jassmann <[email protected]>

scripts/imgtool/image.py

@@ -155,7 +155,7 @@ def __init__(self, version=None, header_size=IMAGE_HEADER_SIZE,
         self.enckey = None
         self.save_enctlv = save_enctlv
         self.enctlv_len = 0
-        self.max_align = int(max_align)
+        self.max_align = DEFAULT_MAX_ALIGN if max_align is None else int(max_align)
 
         if security_counter == 'auto':
             # Security counter has not been explicitly provided,

scripts/imgtool/main.py

@@ -285,16 +285,16 @@ def convert(self, value, param, ctx):
 @click.option('--align', type=click.Choice(['1', '2', '4', '8', '16', '32',
               '64', '128', '256', '512', '1024', '2048', '4096']),
               required=True)
+@click.option('--max-align', type=click.Choice(['1', '2', '4', '8', '16', '32',
+              '64', '128', '256', '512', '1024', '2048', '4096']),
+              required=False)
 @click.option('--public-key-format', type=click.Choice(['hash', 'full']),
               default='hash', help='In what format to add the public key to '
               'the image manifest: full key or hash of the key.')
 @click.option('-k', '--key', metavar='filename')
 @click.command(help='''Create a signed or unsigned image\n
                INFILE and OUTFILE are parsed as Intel HEX if the params have
                .hex extension, otherwise binary format is used''')
-@click.option('--max_align', type=click.Choice(['1', '2', '4', '8', '16', '32',
-              '64', '128', '256', '512', '1024', '2048', '4096']),
-              default=8)
 def sign(key, public_key_format, align, version, pad_sig, header_size,
          pad_header, slot_size, pad, confirm, max_sectors, overwrite_only,
          endian, encrypt, infile, outfile, dependencies, load_addr, hex_addr,