[nrf noup] zephyr: Add support for ARM thumb filter

Adds support to the compressed image update for allowing encrypted
images. Also removes the limit of having 1 updateable image

Signed-off-by: Jamie McCrae <[email protected]>
Signed-off-by: Dominik Ermel <[email protected]>
(cherry picked from commit 390c468)
(cherry picked from commit cbb7da0)
(cherry picked from commit 148712e)

Author: nordicjm

boot/bootutil/src/loader.c

@@ -1612,7 +1612,7 @@ boot_copy_region(struct boot_loader_state *state,
 #else
     (void)state;
 #endif
-#ifdef MCUBOOT_DECOMPRESS_IMAGES
+#if defined(MCUBOOT_DECOMPRESS_IMAGES) && !defined(MCUBOOT_ENC_IMAGES)
     struct image_header *hdr;
 #endif
 

boot/zephyr/Kconfig

@@ -966,8 +966,7 @@ config BOOT_BANNER_STRING
 config BOOT_DECOMPRESSION_SUPPORT
 	bool
 	depends on NRF_COMPRESS && NRF_COMPRESS_DECOMPRESSION && (NRF_COMPRESS_LZMA_VERSION_LZMA1 || NRF_COMPRESS_LZMA_VERSION_LZMA2)
-	depends on !SINGLE_APPLICATION_SLOT && !BOOT_ENCRYPT_IMAGE && BOOT_UPGRADE_ONLY
-	depends on UPDATEABLE_IMAGE_NUMBER = 1
+	depends on !SINGLE_APPLICATION_SLOT && BOOT_UPGRADE_ONLY
 	default y
 	help
 	  Hidden symbol which should be selected if a system provided decompression support.