Skip to content

Commit 7168c62

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 7168c62

File tree

1 file changed

+2
-10
lines changed

1 file changed

+2
-10
lines changed

boot/bootutil/src/bootutil_area.c

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
* Copyright (c) 2016-2019 JUUL Labs
66
* Copyright (c) 2019-2020 Arm Limited
77
* Copyright (c) 2025 Nordic Semiconductor ASA
8+
* Copyright (c) 2025 Siemens AG
89
*
910
* Original license:
1011
*
@@ -27,6 +28,7 @@
2728
*/
2829

2930
#include "bootutil_area.h"
31+
#include "bootutil_priv.h"
3032
#include "bootutil/image.h"
3133
#include "bootutil/bootutil_public.h"
3234
#ifdef MCUBOOT_ENC_IMAGES
@@ -36,16 +38,6 @@
3638

3739
BOOT_LOG_MODULE_DECLARE(mcuboot);
3840

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-
4941
/**
5042
* Amount of space used to save information required when doing a swap,
5143
* or while a swap is under progress, but not the status of sector swap

0 commit comments

Comments
 (0)