sim: swap-move: Allow firmware data in the first trailer sector

When using the swap-move strategy, the simulator now doesn't compute
anymore the maximum image size so the area allocated to the trailer has
a size that is a multiple of the sector size. Indeed, the swap-move
strategy now supports having part of the firmware in the first sector
holding trailer data, allowing larger images.

Signed-off-by: Thomas Altenbach <thomas.altenbach@legrand.com>

Author: taltenbach

sim/src/image.rs

@@ -1807,9 +1807,11 @@ fn image_largest_trailer(dev: &dyn Flash, areadesc: &AreaDesc, slot: &SlotInfo)
             let trailer = if Caps::OverwriteUpgrade.present() {
                 // magic + image-ok + copy-done + swap-info
                 c::boot_magic_sz() + 3 * c::boot_max_align()
-            } else if Caps::SwapUsingOffset.present() || Caps::SwapUsingMove.present() {
+            } else if Caps::SwapUsingOffset.present() {
                 let sector_size = dev.sector_iter().next().unwrap().size as u32;
                 align_up(c::boot_trailer_sz(dev.align() as u32), sector_size) as usize
+            } else if Caps::SwapUsingMove.present() {
+                c::boot_trailer_sz(dev.align() as u32) as usize
             } else if Caps::SwapUsingScratch.present() {
                 estimate_swap_scratch_trailer_size(dev, areadesc, slot)
             } else {