Skip to content

Commit 3853d26

Browse files
gchwieranangl
authored andcommitted
[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)
1 parent ec59c38 commit 3853d26

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

boot/bootutil/src/loader.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1188,6 +1188,8 @@ boot_update_security_counter(uint8_t image_index, int slot,
11881188
}
11891189
#endif /* MCUBOOT_HW_ROLLBACK_PROT */
11901190

1191+
#if !defined(MCUBOOT_DIRECT_XIP) && !defined(MCUBOOT_RAM_LOAD)
1192+
11911193
#if defined(CONFIG_MCUBOOT_CLEANUP_UNUSABLE_SECONDARY) &&\
11921194
(defined(PM_S1_ADDRESS) || defined(CONFIG_SOC_NRF5340_CPUAPP))
11931195

@@ -1269,7 +1271,6 @@ static inline void sec_slot_cleanup_if_unusable(void)
12691271
#endif /* defined(CONFIG_MCUBOOT_CLEANUP_UNUSABLE_SECONDARY) &&\
12701272
defined(PM_S1_ADDRESS) || defined(CONFIG_SOC_NRF5340_CPUAPP) */
12711273

1272-
#if !defined(MCUBOOT_DIRECT_XIP) && !defined(MCUBOOT_RAM_LOAD)
12731274
/**
12741275
* Determines which swap operation to perform, if any. If it is determined
12751276
* that a swap operation is required, the image in the secondary slot is checked

0 commit comments

Comments
 (0)