sim: swap-move: Update expected post-upgrade secondary trailer content

When swap-move is used, the secondary slot's trailer is no longer
expected to be empty after an upgrade has been performed. Instead, the
secondary slot should contain a valid trailer with only the 'copy_done'
flag set.

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

Author: taltenbach

sim/src/image.rs

@@ -742,8 +742,7 @@ impl Images {
                 fails += 1;
             }
 
-            if !self.verify_trailers(&flash, 1, BOOT_MAGIC_UNSET,
-                                     BOOT_FLAG_UNSET, BOOT_FLAG_UNSET) {
+            if !self.verify_post_upgrade_secondary_trailer(&flash) {
                 warn!("Mismatched trailer for the secondary slot");
                 fails += 1;
             }
@@ -792,8 +791,7 @@ impl Images {
             error!("Mismatched trailer for the primary slot");
             fails += 1;
         }
-        if !self.verify_trailers(&flash, 1, BOOT_MAGIC_UNSET,
-                                 BOOT_FLAG_UNSET, BOOT_FLAG_UNSET) {
+        if !self.verify_post_upgrade_secondary_trailer(&flash) {
             error!("Mismatched trailer for the secondary slot");
             fails += 1;
         }
@@ -852,13 +850,14 @@ impl Images {
             warn!("Primary slot image verification FAIL");
             fails += 1;
         }
+
         if !self.verify_trailers(&flash, 0, BOOT_MAGIC_GOOD,
                                  BOOT_FLAG_UNSET, BOOT_FLAG_SET) {
             warn!("Mismatched trailer for the primary slot");
             fails += 1;
         }
-        if !self.verify_trailers(&flash, 1, BOOT_MAGIC_UNSET,
-                                 BOOT_FLAG_UNSET, BOOT_FLAG_UNSET) {
+
+        if !self.verify_post_upgrade_secondary_trailer(&flash) {
             warn!("Mismatched trailer for the secondary slot");
             fails += 1;
         }
@@ -1530,8 +1529,7 @@ impl Images {
             warn!("Mismatched trailer for the primary slot before revert");
             fails += 1;
         }
-        if !self.verify_trailers(&flash, 1, BOOT_MAGIC_UNSET,
-                                BOOT_FLAG_UNSET, BOOT_FLAG_UNSET) {
+        if !self.verify_post_upgrade_secondary_trailer(&flash) {
             warn!("Mismatched trailer for the secondary slot before revert");
             fails += 1;
         }
@@ -1670,6 +1668,17 @@ impl Images {
         })
     }
 
+    // Verify the trailers in the secondary slot contains the expected values after an upgrade.
+    fn verify_post_upgrade_secondary_trailer(&self, flash: &SimMultiFlash) -> bool {
+        if Caps::SwapUsingMove.present() {
+            return self.verify_trailers(&flash, 1, BOOT_MAGIC_GOOD,
+                                        BOOT_FLAG_UNSET, BOOT_FLAG_SET);
+        } else {
+            return self.verify_trailers(&flash, 1, BOOT_MAGIC_UNSET,
+                                        BOOT_FLAG_UNSET, BOOT_FLAG_UNSET);
+        }
+    }
+
     /// Mark each of the images for permanent upgrade.
     fn mark_permanent_upgrades(&self, flash: &mut SimMultiFlash, slot: usize) {
         for image in &self.images {