commit d69933cd46273453e58f102fed69bb637dc13295
author Mateusz Michalek <mateusz.michalek@nordicsemi.no> Fri Oct 04 13:36:52 2024 +0200
committer Dominik Ermel <56024351+de-nordic@users.noreply.github.com> Fri Oct 11 16:17:07 2024 +0200
tree e3d8b332f73a15282a832a6d860baf0678d050b4
parent a5f28c133dcfbf3309eff0a3a73bb9429eee6c08

scripts: imgtool: compression ARM thumb filter

Adds ARM thumb filter to imgtool's LZMA2 compression.

Signed-off-by: Mateusz Michalek <mateusz.michalek@nordicsemi.no>

scripts/imgtool/image.py

diff --git a/scripts/imgtool/image.py b/scripts/imgtool/image.py
index 690f0b7..115d04e 100644
--- a/scripts/imgtool/image.py
+++ b/scripts/imgtool/image.py
@@ -70,6 +70,7 @@
         'ROM_FIXED':             0x0000100,
         'COMPRESSED_LZMA1':      0x0000200,
         'COMPRESSED_LZMA2':      0x0000400,
+        'COMPRESSED_ARM_THUMB':  0x0000800,
 }
 
 TLV_VALUES = {
@@ -533,8 +534,10 @@
 
         compression_flags = 0x0
         if compression_tlvs is not None:
-            if compression_type == "lzma2":
+            if compression_type in ["lzma2", "lzma2armthumb"]:
                 compression_flags = IMAGE_F['COMPRESSED_LZMA2']
+                if compression_type == "lzma2armthumb":
+                    compression_flags |= IMAGE_F['COMPRESSED_ARM_THUMB']
         # This adds the header to the payload as well
         if encrypt_keylen == 256:
             self.add_header(enckey, protected_tlv_size, compression_flags, 256)

scripts/imgtool/main.py

diff --git a/scripts/imgtool/main.py b/scripts/imgtool/main.py
index 03bb565..94952a8 100755
--- a/scripts/imgtool/main.py
+++ b/scripts/imgtool/main.py
@@ -363,7 +363,7 @@
               help='When encrypting the image using AES, select a 128 bit or '
                    '256 bit key len.')
 @click.option('--compression', default='disabled',
-              type=click.Choice(['disabled', 'lzma2']),
+              type=click.Choice(['disabled', 'lzma2', 'lzma2armthumb']),
               help='Enable image compression using specified type. '
                    'Will fall back without image compression automatically '
                    'if the compression increases the image size.')
@@ -513,7 +513,7 @@
                custom_tlvs, compression_tlvs, int(encrypt_keylen), clear,
                baked_signature, pub_key, vector_to_sign, user_sha)
 
-    if compression == "lzma2":
+    if compression in ["lzma2", "lzma2armthumb"]:
         compressed_img = image.Image(version=decode_version(version),
                   header_size=header_size, pad_header=pad_header,
                   pad=pad, confirm=confirm, align=int(align),
@@ -527,6 +527,8 @@
                 "dict_size": comp_default_dictsize, "lp": comp_default_lp,
                 "lc": comp_default_lc}
         ]
+        if compression == "lzma2armthumb":
+            compression_filters.insert(0, {"id":lzma.FILTER_ARMTHUMB})
         compressed_data = lzma.compress(img.get_infile_data(),filters=compression_filters,
             format=lzma.FORMAT_RAW)
         uncompressed_size = len(img.get_infile_data())