michaelh/zephyr
1
0
Fork 0
Code Releases Activity

sysbuild: Update MCUboot swap using move Kconfig name

Browse source 
Deprecates the old Kconfig and adds a new one which lines up with
the name of the Kconfig used by MCUboot

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
This commit is contained in:
Jamie McCrae 2025-01-13 10:50:59 +00:00 • committed by Benjamin Cabé
commit 55dba488a4
3 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
share/sysbuild/image_configurations/BOOTLOADER_image_default.cmake
View file

@ -15,7 +15,7 @@ set(bootmodes CONFIG_SINGLE_APPLICATION_SLOT
if(SB_CONFIG_MCUBOOT_MODE_SINGLE_APP)
set(bootmode CONFIG_SINGLE_APPLICATION_SLOT)
elseif(SB_CONFIG_MCUBOOT_MODE_SWAP_WITHOUT_SCRATCH)
elseif(SB_CONFIG_MCUBOOT_MODE_SWAP_WITHOUT_SCRATCH OR SB_CONFIG_MCUBOOT_MODE_SWAP_USING_MOVE)
set(bootmode CONFIG_BOOT_SWAP_USING_MOVE)
elseif(SB_CONFIG_MCUBOOT_MODE_SWAP_SCRATCH)
set(bootmode CONFIG_BOOT_SWAP_USING_SCRATCH)

4
share/sysbuild/image_configurations/MAIN_image_default.cmake
View file

@ -22,8 +22,8 @@ if(SB_CONFIG_BOOTLOADER_MCUBOOT)
if(SB_CONFIG_MCUBOOT_MODE_SINGLE_APP)
set_config_bool(${ZCMAKE_APPLICATION} CONFIG_MCUBOOT_BOOTLOADER_MODE_SINGLE_APP y)
elseif(SB_CONFIG_MCUBOOT_MODE_SWAP_WITHOUT_SCRATCH)
set_config_bool(${ZCMAKE_APPLICATION} CONFIG_MCUBOOT_BOOTLOADER_MODE_SWAP_WITHOUT_SCRATCH y)
elseif(SB_CONFIG_MCUBOOT_MODE_SWAP_WITHOUT_SCRATCH OR SB_CONFIG_MCUBOOT_MODE_SWAP_USING_MOVE)
set_config_bool(${ZCMAKE_APPLICATION} CONFIG_MCUBOOT_BOOTLOADER_MODE_SWAP_USING_MOVE y)
elseif(SB_CONFIG_MCUBOOT_MODE_SWAP_SCRATCH)
set_config_bool(${ZCMAKE_APPLICATION} CONFIG_MCUBOOT_BOOTLOADER_MODE_SWAP_SCRATCH y)
elseif(SB_CONFIG_MCUBOOT_MODE_OVERWRITE_ONLY)

12
share/sysbuild/images/bootloader/Kconfig
View file

@ -32,7 +32,7 @@ if BOOTLOADER_MCUBOOT
choice MCUBOOT_MODE
prompt "Mode of operation"
default MCUBOOT_MODE_SWAP_WITHOUT_SCRATCH
default MCUBOOT_MODE_SWAP_USING_MOVE
help
The operating mode of MCUboot (which will also be propagated to the application).
@ -43,13 +43,19 @@ config MCUBOOT_MODE_SINGLE_APP
slots. In this mode application is not able to DFU its own update to secondary slot and
all updates need to be performed using MCUboot serial recovery.
config MCUBOOT_MODE_SWAP_WITHOUT_SCRATCH
bool "Swap without scratch (swap using move)"
config MCUBOOT_MODE_SWAP_USING_MOVE
bool "Swap using move"
help
MCUboot expects slot0_partition and slot1_partition to be present in DT and application
will boot from slot0_partition. MCUBOOT_BOOTLOADER_NO_DOWNGRADE should also be selected
in main application if MCUboot has been built with MCUBOOT_DOWNGRADE_PREVENTION.
config MCUBOOT_MODE_SWAP_WITHOUT_SCRATCH
bool "Swap without scratch (swap using move) [DEPRECATED]"
select DEPRECATED
help
This Kconfig is deprecated, use MCUBOOT_MODE_SWAP_USING_MOVE instead.
config MCUBOOT_MODE_SWAP_SCRATCH
bool "Swap using scratch"
help