sysbuild: bootloader: Remove deprecated Kconfig

Removes the previously deprecated
SB_CONFIG_MCUBOOT_MODE_SWAP_WITHOUT_SCRATCH sysbuild Kconfig

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>

Author: nordicjm

share/sysbuild/image_configurations/BOOTLOADER_image_default.cmake

@@ -19,7 +19,7 @@ if(SB_CONFIG_MCUBOOT_MODE_SINGLE_APP)
   set(bootmode CONFIG_SINGLE_APPLICATION_SLOT)
 elseif(SB_CONFIG_MCUBOOT_MODE_SWAP_USING_OFFSET)
   set(bootmode CONFIG_BOOT_SWAP_USING_OFFSET)
-elseif(SB_CONFIG_MCUBOOT_MODE_SWAP_WITHOUT_SCRATCH OR SB_CONFIG_MCUBOOT_MODE_SWAP_USING_MOVE)
+elseif(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)

share/sysbuild/image_configurations/MAIN_image_default.cmake

@@ -24,7 +24,7 @@ if(SB_CONFIG_BOOTLOADER_MCUBOOT)
     set_config_bool(${ZCMAKE_APPLICATION} CONFIG_MCUBOOT_BOOTLOADER_MODE_SINGLE_APP y)
   elseif(SB_CONFIG_MCUBOOT_MODE_SWAP_USING_OFFSET)
     set_config_bool(${ZCMAKE_APPLICATION} CONFIG_MCUBOOT_BOOTLOADER_MODE_SWAP_USING_OFFSET y)
-  elseif(SB_CONFIG_MCUBOOT_MODE_SWAP_WITHOUT_SCRATCH OR SB_CONFIG_MCUBOOT_MODE_SWAP_USING_MOVE)
+  elseif(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)

share/sysbuild/images/bootloader/Kconfig

@@ -59,12 +59,6 @@ config MCUBOOT_MODE_SWAP_USING_MOVE
 	  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