From 7cec80a04eeb922efc543942ce26016b1f5613ac Mon Sep 17 00:00:00 2001 From: kkrentz Date: Mon, 3 Nov 2025 16:52:46 +0100 Subject: [PATCH] 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 --- boot/bootutil/src/bootutil_area.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/boot/bootutil/src/bootutil_area.c b/boot/bootutil/src/bootutil_area.c index 19001f3fe4..3bd6bb0a10 100644 --- a/boot/bootutil/src/bootutil_area.c +++ b/boot/bootutil/src/bootutil_area.c @@ -27,6 +27,7 @@ */ #include "bootutil_area.h" +#include "bootutil_priv.h" #include "bootutil/image.h" #include "bootutil/bootutil_public.h" #ifdef MCUBOOT_ENC_IMAGES @@ -36,16 +37,6 @@ BOOT_LOG_MODULE_DECLARE(mcuboot); -#if !defined(MCUBOOT_OVERWRITE_ONLY) && \ - !defined(MCUBOOT_SWAP_USING_MOVE) && \ - !defined(MCUBOOT_SWAP_USING_OFFSET) && \ - !defined(MCUBOOT_DIRECT_XIP) && \ - !defined(MCUBOOT_RAM_LOAD) && \ - !defined(MCUBOOT_SINGLE_APPLICATION_SLOT) && \ - !defined(MCUBOOT_FIRMWARE_LOADER) -#define MCUBOOT_SWAP_USING_SCRATCH 1 -#endif - /** * Amount of space used to save information required when doing a swap, * or while a swap is under progress, but not the status of sector swap