booutil: swap_scratch: Do not check sectors with compression

nordicjm · nordicjm · commit 2931f9d71f76 · 2024-08-27T15:34:13.000+01:00
When compression is used, it allows for the secondary slot to be
smaller than the primary slot, therefore do not ensure that the
number of sectors in each slot are the same

Signed-off-by: Jamie McCrae &lt;jamie.mccrae@nordicsemi.no&gt;
diff --git a/boot/bootutil/src/swap_scratch.c b/boot/bootutil/src/swap_scratch.c
@@ -218,12 +218,14 @@ boot_slots_compatible(struct boot_loader_state *state)
 #endif
     }
 
+#ifndef MCUBOOT_DECOMPRESS_IMAGES
     if ((i != num_sectors_primary) ||
         (j != num_sectors_secondary) ||
         (primary_slot_sz != secondary_slot_sz)) {
         BOOT_LOG_WRN("Cannot upgrade: slots are not compatible");
         return 0;
     }
+#endif
 
     return 1;
 }

Original file line number	Diff line number	Diff line change
`@@ -218,12 +218,14 @@ boot_slots_compatible(struct boot_loader_state *state)`
`218`	`218`	`#endif`
`219`	`219`	`}`
`220`	`220`
	`221`	`+#ifndef MCUBOOT_DECOMPRESS_IMAGES`
`221`	`222`	`if ((i != num_sectors_primary) \|\|`
`222`	`223`	`(j != num_sectors_secondary) \|\|`
`223`	`224`	`(primary_slot_sz != secondary_slot_sz)) {`
`224`	`225`	`BOOT_LOG_WRN("Cannot upgrade: slots are not compatible");`
`225`	`226`	`return 0;`
`226`	`227`	`}`
	`228`	`+#endif`
`227`	`229`
`228`	`230`	`return 1;`
`229`	`231`	`}`