[nrf noup] loader: remove cleanup for direct xip mode

Move ifdefs just to not add code for cleanup unusable slot when direct xip mode is enabled to avoid warnings. Signed-off-by: Grzegorz Chwierut <[email protected]> (cherry picked from commit 650d11c)
voxelbotics · Jun 28, 2024 · 3853d26 · 3853d26
1 parent ec59c38
commit 3853d26
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/boot/bootutil/src/loader.c b/boot/bootutil/src/loader.c
@@ -1188,6 +1188,8 @@ boot_update_security_counter(uint8_t image_index, int slot,
 }
 #endif /* MCUBOOT_HW_ROLLBACK_PROT */
 
+#if !defined(MCUBOOT_DIRECT_XIP) && !defined(MCUBOOT_RAM_LOAD)
+
 #if defined(CONFIG_MCUBOOT_CLEANUP_UNUSABLE_SECONDARY) &&\
 (defined(PM_S1_ADDRESS) || defined(CONFIG_SOC_NRF5340_CPUAPP))
 
@@ -1269,7 +1271,6 @@ static inline void sec_slot_cleanup_if_unusable(void)
 #endif /* defined(CONFIG_MCUBOOT_CLEANUP_UNUSABLE_SECONDARY) &&\
           defined(PM_S1_ADDRESS) || defined(CONFIG_SOC_NRF5340_CPUAPP) */
 
-#if !defined(MCUBOOT_DIRECT_XIP) && !defined(MCUBOOT_RAM_LOAD)
 /**
  * Determines which swap operation to perform, if any.  If it is determined
  * that a swap operation is required, the image in the secondary slot is checked