Skip to content

bootutil: Avoid re-definition of MCUBOOT_SWAP_USING_SCRATCH #2577

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nordicjm merged 1 commit into from
Dec 8, 2025
+1 −10
Merged

bootutil: Avoid re-definition of MCUBOOT_SWAP_USING_SCRATCH #2577

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 1 addition & 10 deletions boot/bootutil/src/bootutil_area.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
Loading