zephyr: Fix trailer size computation for swap-scratch

When swap-scratch is used, the trailer size doesn't have to be rounded
up to the next multiple of the sector size. Indeed, the trailer only
need to be sector-aligned for swap-move and swap-offset.

Signed-off-by: Thomas Altenbach <[email protected]>

Author: taltenbach

boot/zephyr/CMakeLists.txt

@@ -678,15 +678,21 @@ if(SYSBUILD)
     endif()
 
     math(EXPR trailer_size "${key_size} + ${boot_magic_size} + ${boot_swap_data_size} + ${boot_status_data_size}")
-    align_up(${trailer_size} ${erase_size} trailer_size)
+
+    if(CONFIG_BOOT_SWAP_USING_MOVE OR CONFIG_BOOT_SWAP_USING_OFFSET)
+      align_up(${trailer_size} ${erase_size} trailer_size)
+    endif()
 
     math(EXPR required_size "${trailer_size} + ${boot_tlv_estimate}")
 
     if(CONFIG_SINGLE_APPLICATION_SLOT OR CONFIG_BOOT_FIRMWARE_LOADER)
       set(required_upgrade_size "0")
     else()
       math(EXPR required_upgrade_size "${boot_magic_size} + ${boot_swap_data_size} + ${boot_status_data_size}")
-      align_up(${required_upgrade_size} ${erase_size} required_upgrade_size)
+
+      if(CONFIG_BOOT_SWAP_USING_MOVE OR CONFIG_BOOT_SWAP_USING_OFFSET)
+        align_up(${required_upgrade_size} ${erase_size} required_upgrade_size)
+      endif()
     endif()
 
     if(CONFIG_BOOT_SWAP_USING_MOVE)