Skip to content

Commit 7cec80a

Browse files
committed
bootutil: Avoid re-definition of MCUBOOT_SWAP_USING_SCRATCH
Two identical definitions of MCUBOOT_SWAP_USING_SCRATCH occur in bootutil_priv.h and bootutil_area.c. This commit removes the duplicate in bootutil_area.c. Signed-off-by: kkrentz <konrad.krentz@gmail.com>
1 parent afcca2c commit 7cec80a

File tree

1 file changed

+1
-10
lines changed

1 file changed

+1
-10
lines changed

boot/bootutil/src/bootutil_area.c

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
*/
2828

2929
#include "bootutil_area.h"
30+
#include "bootutil_priv.h"
3031
#include "bootutil/image.h"
3132
#include "bootutil/bootutil_public.h"
3233
#ifdef MCUBOOT_ENC_IMAGES
@@ -36,16 +37,6 @@
3637

3738
BOOT_LOG_MODULE_DECLARE(mcuboot);
3839

39-
#if !defined(MCUBOOT_OVERWRITE_ONLY) && \
40-
!defined(MCUBOOT_SWAP_USING_MOVE) && \
41-
!defined(MCUBOOT_SWAP_USING_OFFSET) && \
42-
!defined(MCUBOOT_DIRECT_XIP) && \
43-
!defined(MCUBOOT_RAM_LOAD) && \
44-
!defined(MCUBOOT_SINGLE_APPLICATION_SLOT) && \
45-
!defined(MCUBOOT_FIRMWARE_LOADER)
46-
#define MCUBOOT_SWAP_USING_SCRATCH 1
47-
#endif
48-
4940
/**
5041
* Amount of space used to save information required when doing a swap,
5142
* or while a swap is under progress, but not the status of sector swap

0 commit comments

Comments
 (0)