Skip to content

boot: zephyr: kconfig: Default to swap using offset #2266

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
merged 2 commits into from
Jul 18, 2025
Merged

boot: zephyr: kconfig: Default to swap using offset #2266

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e1b4677
boot: zephyr: Set prefer swap using move for aligned boards
nordicjm Jul 18, 2025
ed957d4
boot: zephyr: kconfig: Default to swap using offset
nordicjm Apr 17, 2025
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
3 changes: 2 additions & 1 deletion boot/zephyr/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -408,14 +408,15 @@ config BOOT_VALIDATE_SLOT0_ONCE

config BOOT_PREFER_SWAP_OFFSET
bool "Prefer the newer swap offset algorithm"
default y if !$(dt_nodelabel_enabled,scratch_partition) && !SOC_FAMILY_STM32
help
If y, the BOOT_IMAGE_UPGRADE_MODE will default to using "offset" instead of "scratch".
This is a separate bool config option, because Kconfig doesn't allow defaults to be
overridden in choice options. Most devices should be using swap using offset mode.

config BOOT_PREFER_SWAP_MOVE
bool "Prefer the newer swap move algorithm"
default y if SOC_FAMILY_NORDIC_NRF
depends on !BOOT_PREFER_SWAP_OFFSET
default y if !$(dt_nodelabel_enabled,scratch_partition)
help
If y, the BOOT_IMAGE_UPGRADE_MODE will default to using
Expand Down
3 changes: 3 additions & 0 deletions boot/zephyr/boards/ctcc_nrf52840.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,6 @@ CONFIG_MULTITHREADING=y
# USB
CONFIG_USB_DEVICE_STACK=y
CONFIG_USB_DEVICE_REMOTE_WAKEUP=n

# Partitions set up for swap using move
CONFIG_BOOT_PREFER_SWAP_MOVE=y
2 changes: 2 additions & 0 deletions boot/zephyr/boards/decawave_dwm3001cdk.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Partitions set up for swap using move
CONFIG_BOOT_PREFER_SWAP_MOVE=y
2 changes: 2 additions & 0 deletions boot/zephyr/boards/it8xxx2_evb.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Partitions set up for swap using move
CONFIG_BOOT_PREFER_SWAP_MOVE=y
2 changes: 2 additions & 0 deletions boot/zephyr/boards/micromod_nrf52840..conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Partitions set up for swap using move
CONFIG_BOOT_PREFER_SWAP_MOVE=y
2 changes: 2 additions & 0 deletions boot/zephyr/boards/myra_sip_baseboard.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Partitions set up for swap using move
CONFIG_BOOT_PREFER_SWAP_MOVE=y
2 changes: 2 additions & 0 deletions boot/zephyr/boards/numaker_pfm_m467.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Partitions set up for swap using move
CONFIG_BOOT_PREFER_SWAP_MOVE=y
Loading