Revert "bootutil: Fix wrong definition of find_swap_count"
This reverts commit ab4fb3299ae5148e9a1bb9171f23bd445ae4cd38.
This was a wrong change and was caused by a faulty TFM board
Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
diff --git a/boot/bootutil/src/swap_scratch.c b/boot/bootutil/src/swap_scratch.c
index 2fcf76f..24159d1 100644
--- a/boot/bootutil/src/swap_scratch.c
+++ b/boot/bootutil/src/swap_scratch.c
@@ -493,6 +493,35 @@
}
/**
+ * Finds the number of swap operations that have to be performed to swap the two images.
+ *
+ * @param state Current bootloader's state.
+ * @param copy_size Total number of bytes to swap.
+ *
+ * @return The number of swap operations that have to be performed.
+*/
+static uint32_t
+find_swap_count(const struct boot_loader_state *state, uint32_t copy_size)
+{
+ int first_sector_idx;
+ int last_sector_idx;
+ uint32_t swap_count;
+
+ last_sector_idx = find_last_sector_idx(state, copy_size);
+
+ swap_count = 0;
+
+ while (last_sector_idx >= 0) {
+ boot_copy_sz(state, last_sector_idx, &first_sector_idx);
+
+ last_sector_idx = first_sector_idx - 1;
+ swap_count++;
+ }
+
+ return swap_count;
+}
+
+/**
* Swaps the contents of two flash regions within the two image slots.
*
* @param idx The index of the first sector in the range of
@@ -732,37 +761,6 @@
}
#endif /* !MCUBOOT_OVERWRITE_ONLY */
-#ifdef MCUBOOT_SWAP_USING_SCRATCH
-/**
- * Finds the number of swap operations that have to be performed to swap the two images.
- *
- * @param state Current bootloader's state.
- * @param copy_size Total number of bytes to swap.
- *
- * @return The number of swap operations that have to be performed.
-*/
-static uint32_t
-find_swap_count(const struct boot_loader_state *state, uint32_t copy_size)
-{
- int first_sector_idx;
- int last_sector_idx;
- uint32_t swap_count;
-
- last_sector_idx = find_last_sector_idx(state, copy_size);
-
- swap_count = 0;
-
- while (last_sector_idx >= 0) {
- boot_copy_sz(state, last_sector_idx, &first_sector_idx);
-
- last_sector_idx = first_sector_idx - 1;
- swap_count++;
- }
-
- return swap_count;
-}
-#endif /* MCUBOOT_SWAP_USING_SCRATCH */
-
int app_max_size(struct boot_loader_state *state)
{
size_t num_sectors_primary;