sysbuild: Do not configure MCUboot mode

This is now handled by Zephyr already

Signed-off-by: Jamie McCrae <[email protected]>

Author: nordicjm

sysbuild/CMakeLists.txt

@@ -171,43 +171,6 @@ function(${SYSBUILD_CURRENT_MODULE_NAME}_pre_cmake)
       endforeach()
     endif()
 
-    # Set MCUboot operating mode in application and MCUboot
-# TODO: NCSDK-24488 add RAM LOAD mode
-    set(mcuboot_modes "CONFIG_SINGLE_APPLICATION_SLOT;CONFIG_BOOT_SWAP_USING_MOVE;CONFIG_BOOT_SWAP_USING_SCRATCH;CONFIG_BOOT_UPGRADE_ONLY;CONFIG_BOOT_DIRECT_XIP;CONFIG_BOOT_DIRECT_XIP_REVERT;CONFIG_BOOT_FIRMWARE_LOADER")
-    set(application_mcuboot_modes "CONFIG_MCUBOOT_BOOTLOADER_MODE_SINGLE_APP;CONFIG_MCUBOOT_BOOTLOADER_MODE_SWAP_WITHOUT_SCRATCH;CONFIG_MCUBOOT_BOOTLOADER_MODE_SWAP_SCRATCH;CONFIG_MCUBOOT_BOOTLOADER_MODE_OVERWRITE_ONLY;CONFIG_MCUBOOT_BOOTLOADER_MODE_DIRECT_XIP;CONFIG_MCUBOOT_BOOTLOADER_MODE_DIRECT_XIP_WITH_REVERT;CONFIG_MCUBOOT_BOOTLOADER_MODE_FIRMWARE_UPDATER")
-
-    if(SB_CONFIG_MCUBOOT_MODE_SINGLE_APP)
-      set(mcuboot_mode CONFIG_SINGLE_APPLICATION_SLOT)
-      set(application_mcuboot_mode CONFIG_MCUBOOT_BOOTLOADER_MODE_SINGLE_APP)
-    elseif(SB_CONFIG_MCUBOOT_MODE_SWAP_WITHOUT_SCRATCH)
-      set(mcuboot_mode CONFIG_BOOT_SWAP_USING_MOVE)
-      set(application_mcuboot_mode CONFIG_MCUBOOT_BOOTLOADER_MODE_SWAP_WITHOUT_SCRATCH)
-    elseif(SB_CONFIG_MCUBOOT_MODE_SWAP_SCRATCH)
-      set(mcuboot_mode CONFIG_BOOT_SWAP_USING_SCRATCH)
-      set(application_mcuboot_mode CONFIG_MCUBOOT_BOOTLOADER_MODE_SWAP_SCRATCH)
-    elseif(SB_CONFIG_MCUBOOT_MODE_OVERWRITE_ONLY)
-      set(mcuboot_mode CONFIG_BOOT_UPGRADE_ONLY)
-      set(application_mcuboot_mode CONFIG_MCUBOOT_BOOTLOADER_MODE_OVERWRITE_ONLY)
-    elseif(SB_CONFIG_MCUBOOT_MODE_DIRECT_XIP)
-      set(mcuboot_mode CONFIG_BOOT_DIRECT_XIP)
-      set(application_mcuboot_mode CONFIG_MCUBOOT_BOOTLOADER_MODE_DIRECT_XIP)
-    elseif(SB_CONFIG_MCUBOOT_MODE_DIRECT_XIP_WITH_REVERT)
-      set(mcuboot_mode CONFIG_BOOT_DIRECT_XIP;CONFIG_BOOT_DIRECT_XIP_REVERT)
-      set(application_mcuboot_mode CONFIG_MCUBOOT_BOOTLOADER_MODE_DIRECT_XIP_WITH_REVERT)
-    elseif(SB_CONFIG_MCUBOOT_MODE_FIRMWARE_UPDATER)
-      set(mcuboot_mode CONFIG_BOOT_FIRMWARE_LOADER)
-      set(application_mcuboot_mode CONFIG_MCUBOOT_BOOTLOADER_MODE_FIRMWARE_UPDATER)
-    endif()
-
-    # Apply configuration to MCUboot
-    foreach(mode ${mcuboot_modes})
-      if("${mode}" IN_LIST mcuboot_mode)
-        set_config_bool(mcuboot ${mode} y)
-      else()
-        set_config_bool(mcuboot ${mode} n)
-      endif()
-    endforeach()
-
     if(SB_CONFIG_BOOT_SIGNATURE_TYPE_PURE)
       set_config_bool(mcuboot CONFIG_BOOT_SIGNATURE_TYPE_PURE y)
     endif()