applications/samples: Remove redundant multithreding config in mcuboot

nordic-mik7 · carlescufi · commit 93dd22c7ac46 · 2025-07-21T16:24:24.000+02:00
Remove multithreading enabling from mcuboot where it is not needed.
SPI/QSPI drivers do not require multithreading support anymore.

Signed-off-by: Michal Kozikowski &lt;michal.kozikowski@nordicsemi.no&gt;
diff --git a/applications/machine_learning/sysbuild/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.conf b/applications/machine_learning/sysbuild/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.conf
@@ -32,9 +32,6 @@ CONFIG_NORDIC_QSPI_NOR=y
 CONFIG_NORDIC_QSPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096
 CONFIG_NORDIC_QSPI_NOR_STACK_WRITE_BUFFER_SIZE=16
 
-# Required by QSPI
-CONFIG_MULTITHREADING=y
-
 # Decrease memory footprint
 CONFIG_CBPRINTF_NANO=y
 CONFIG_TIMESLICING=n
diff --git a/applications/machine_learning/sysbuild/mcuboot/boards/thingy53_nrf5340_cpuapp.conf b/applications/machine_learning/sysbuild/mcuboot/boards/thingy53_nrf5340_cpuapp.conf
@@ -37,7 +37,7 @@ CONFIG_NORDIC_QSPI_NOR=y
 CONFIG_NORDIC_QSPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096
 CONFIG_NORDIC_QSPI_NOR_STACK_WRITE_BUFFER_SIZE=16
 
-# Required by USB and QSPI
+# Required by USB
 CONFIG_MULTITHREADING=y
 
 # USB
diff --git a/applications/matter_bridge/sysbuild/mcuboot/boards/nrf7002dk_nrf5340_cpuapp.conf b/applications/matter_bridge/sysbuild/mcuboot/boards/nrf7002dk_nrf5340_cpuapp.conf
@@ -11,7 +11,6 @@ CONFIG_SPI_NOR=y
 CONFIG_SPI_NOR_SFDP_DEVICETREE=y
 CONFIG_SPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096
 
-CONFIG_MULTITHREADING=y
 CONFIG_PM_OVERRIDE_EXTERNAL_DRIVER_CHECK=y
 
 # The following configurations are required to support simultaneous multi image update
diff --git a/applications/nrf5340_audio/sysbuild/mcuboot/prj_fota.conf b/applications/nrf5340_audio/sysbuild/mcuboot/prj_fota.conf
@@ -51,7 +51,6 @@ CONFIG_SPI_NOR=y
 CONFIG_SPI_NOR_SFDP_DEVICETREE=y
 CONFIG_SPI_NOR_CS_WAIT_DELAY=5
 CONFIG_SPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096
-CONFIG_MULTITHREADING=y
 CONFIG_BOOT_ERASE_PROGRESSIVELY=y
 CONFIG_SOC_FLASH_NRF_EMULATE_ONE_BYTE_WRITE_ACCESS=y
 
diff --git a/applications/serial_lte_modem/sysbuild/mcuboot/boards/thingy91x_nrf9151.conf b/applications/serial_lte_modem/sysbuild/mcuboot/boards/thingy91x_nrf9151.conf
@@ -5,7 +5,6 @@ CONFIG_SPI=y
 CONFIG_SPI_NOR=y
 CONFIG_SPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096
 CONFIG_SPI_NOR_SFDP_DEVICETREE=y
-CONFIG_MULTITHREADING=y
 
 # Disable Zephyr console and use UART for MCUboot serial recovery instead
 CONFIG_CONSOLE=n
diff --git a/samples/bluetooth/fast_pair/locator_tag/sysbuild/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.conf b/samples/bluetooth/fast_pair/locator_tag/sysbuild/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.conf
@@ -10,7 +10,6 @@ CONFIG_BOOT_MAX_IMG_SECTORS=2048
 CONFIG_CLOCK_CONTROL=y
 CONFIG_SYS_CLOCK_EXISTS=y
 CONFIG_NRF_RTC_TIMER=y
-CONFIG_MULTITHREADING=y
 CONFIG_NORDIC_QSPI_NOR=y
 CONFIG_NORDIC_QSPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096
 CONFIG_NORDIC_QSPI_NOR_STACK_WRITE_BUFFER_SIZE=16
diff --git a/samples/bluetooth/fast_pair/locator_tag/sysbuild/mcuboot/boards/thingy53_nrf5340_cpuapp.conf b/samples/bluetooth/fast_pair/locator_tag/sysbuild/mcuboot/boards/thingy53_nrf5340_cpuapp.conf
@@ -13,7 +13,6 @@ CONFIG_BOARD_SERIAL_BACKEND_CDC_ACM=n
 CONFIG_CLOCK_CONTROL=y
 CONFIG_SYS_CLOCK_EXISTS=y
 CONFIG_NRF_RTC_TIMER=y
-CONFIG_MULTITHREADING=y
 CONFIG_NORDIC_QSPI_NOR=y
 CONFIG_NORDIC_QSPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096
 CONFIG_NORDIC_QSPI_NOR_STACK_WRITE_BUFFER_SIZE=16
diff --git a/samples/bluetooth/peripheral_status/sysbuild/mcuboot/boards/thingy53_nrf5340_cpuapp.conf b/samples/bluetooth/peripheral_status/sysbuild/mcuboot/boards/thingy53_nrf5340_cpuapp.conf
@@ -31,7 +31,7 @@ CONFIG_NORDIC_QSPI_NOR=y
 CONFIG_NORDIC_QSPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096
 CONFIG_NORDIC_QSPI_NOR_STACK_WRITE_BUFFER_SIZE=16
 
-# Required by USB and QSPI
+# Required by USB
 CONFIG_MULTITHREADING=y
 
 # USB
diff --git a/samples/cellular/nrf_cloud_multi_service/sysbuild/mcuboot/boards/nrf9151dk_nrf9151.conf b/samples/cellular/nrf_cloud_multi_service/sysbuild/mcuboot/boards/nrf9151dk_nrf9151.conf
@@ -11,7 +11,6 @@ CONFIG_SPI_NOR=y
 CONFIG_SPI_NOR_SFDP_DEVICETREE=y
 CONFIG_SPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096
 CONFIG_SPI_NRFX_RAM_BUFFER_SIZE=32
-CONFIG_MULTITHREADING=y
 
 CONFIG_PM_OVERRIDE_EXTERNAL_DRIVER_CHECK=y
 
@@ -29,8 +28,6 @@ CONFIG_FLASH=y
 
 CONFIG_BOOT_MAX_IMG_SECTORS=256
 
-CONFIG_MULTITHREADING=y
-
 CONFIG_LOG=y
 CONFIG_LOG_MODE_MINIMAL=y
 CONFIG_LOG_DEFAULT_LEVEL=0
diff --git a/samples/cellular/nrf_cloud_multi_service/sysbuild/mcuboot/boards/nrf9160dk_nrf9160.conf b/samples/cellular/nrf_cloud_multi_service/sysbuild/mcuboot/boards/nrf9160dk_nrf9160.conf
@@ -25,8 +25,6 @@ CONFIG_FLASH=y
 
 CONFIG_BOOT_MAX_IMG_SECTORS=256
 
-CONFIG_MULTITHREADING=y
-
 CONFIG_LOG=y
 CONFIG_LOG_MODE_MINIMAL=y
 CONFIG_LOG_DEFAULT_LEVEL=0
diff --git a/samples/cellular/nrf_cloud_multi_service/sysbuild/mcuboot/boards/nrf9161dk_nrf9161.conf b/samples/cellular/nrf_cloud_multi_service/sysbuild/mcuboot/boards/nrf9161dk_nrf9161.conf
@@ -11,7 +11,6 @@ CONFIG_SPI_NOR=y
 CONFIG_SPI_NOR_SFDP_DEVICETREE=y
 CONFIG_SPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096
 CONFIG_SPI_NRFX_RAM_BUFFER_SIZE=32
-CONFIG_MULTITHREADING=y
 
 CONFIG_PM_OVERRIDE_EXTERNAL_DRIVER_CHECK=y
 
@@ -29,8 +28,6 @@ CONFIG_FLASH=y
 
 CONFIG_BOOT_MAX_IMG_SECTORS=256
 
-CONFIG_MULTITHREADING=y
-
 CONFIG_LOG=y
 CONFIG_LOG_MODE_MINIMAL=y
 CONFIG_LOG_DEFAULT_LEVEL=0
diff --git a/samples/cellular/nrf_cloud_multi_service/sysbuild/mcuboot/boards/thingy91x_nrf9151.conf b/samples/cellular/nrf_cloud_multi_service/sysbuild/mcuboot/boards/thingy91x_nrf9151.conf
@@ -5,7 +5,6 @@ CONFIG_SPI=y
 CONFIG_SPI_NOR=y
 CONFIG_SPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096
 CONFIG_SPI_NOR_SFDP_DEVICETREE=y
-CONFIG_MULTITHREADING=y
 
 # Disable Zephyr console and use UART for MCUboot serial recovery instead
 CONFIG_CONSOLE=n
diff --git a/samples/cellular/nrf_cloud_rest_fota/sysbuild/mcuboot/boards/thingy91x_nrf9151.conf b/samples/cellular/nrf_cloud_rest_fota/sysbuild/mcuboot/boards/thingy91x_nrf9151.conf
@@ -5,7 +5,6 @@ CONFIG_SPI=y
 CONFIG_SPI_NOR=y
 CONFIG_SPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096
 CONFIG_SPI_NOR_SFDP_DEVICETREE=y
-CONFIG_MULTITHREADING=y
 
 # Disable Zephyr console and use UART for MCUboot serial recovery instead
 CONFIG_CONSOLE=n
diff --git a/samples/matter/light_bulb/sysbuild/mcuboot/boards/nrf54l15dk_nrf54l15_cpuapp.conf b/samples/matter/light_bulb/sysbuild/mcuboot/boards/nrf54l15dk_nrf54l15_cpuapp.conf
@@ -16,9 +16,6 @@ CONFIG_SPI_NOR=y
 CONFIG_SPI_NOR_SFDP_DEVICETREE=y
 CONFIG_SPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096
 
-# required by SPI driver
-CONFIG_MULTITHREADING=y
-
 CONFIG_PM_OVERRIDE_EXTERNAL_DRIVER_CHECK=y
 
 # Adjust the maximum sectors to the app image size of ~1.4MB
diff --git a/samples/matter/light_bulb/sysbuild/mcuboot/boards/nrf54lm20dk_nrf54lm20a_cpuapp.conf b/samples/matter/light_bulb/sysbuild/mcuboot/boards/nrf54lm20dk_nrf54lm20a_cpuapp.conf
@@ -13,7 +13,6 @@ CONFIG_SPI=y
 CONFIG_SPI_NOR=y
 CONFIG_SPI_NOR_SFDP_DEVICETREE=y
 CONFIG_SPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096
-CONFIG_MULTITHREADING=y
 CONFIG_PM_OVERRIDE_EXTERNAL_DRIVER_CHECK=y
 
 # Increase the maximum number of sectors to 512 to fit the big image size (> 1024 kB).
diff --git a/samples/matter/light_bulb/sysbuild/mcuboot/boards/nrf7002dk_nrf5340_cpuapp.conf b/samples/matter/light_bulb/sysbuild/mcuboot/boards/nrf7002dk_nrf5340_cpuapp.conf
@@ -11,7 +11,6 @@ CONFIG_SPI_NOR=y
 CONFIG_SPI_NOR_SFDP_DEVICETREE=y
 CONFIG_SPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096
 
-CONFIG_MULTITHREADING=y
 CONFIG_PM_OVERRIDE_EXTERNAL_DRIVER_CHECK=y
 
 # The following configurations are required to support simultaneous multi image update
diff --git a/samples/matter/light_switch/sysbuild/mcuboot/boards/nrf54l15dk_nrf54l15_cpuapp.conf b/samples/matter/light_switch/sysbuild/mcuboot/boards/nrf54l15dk_nrf54l15_cpuapp.conf
@@ -16,9 +16,6 @@ CONFIG_SPI_NOR=y
 CONFIG_SPI_NOR_SFDP_DEVICETREE=y
 CONFIG_SPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096
 
-# required by SPI driver
-CONFIG_MULTITHREADING=y
-
 CONFIG_PM_OVERRIDE_EXTERNAL_DRIVER_CHECK=y
 
 # Adjust the maximum sectors to the app image size of ~1.4MB
diff --git a/samples/matter/light_switch/sysbuild/mcuboot/boards/nrf54lm20dk_nrf54lm20a_cpuapp.conf b/samples/matter/light_switch/sysbuild/mcuboot/boards/nrf54lm20dk_nrf54lm20a_cpuapp.conf
@@ -13,7 +13,6 @@ CONFIG_SPI=y
 CONFIG_SPI_NOR=y
 CONFIG_SPI_NOR_SFDP_DEVICETREE=y
 CONFIG_SPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096
-CONFIG_MULTITHREADING=y
 CONFIG_PM_OVERRIDE_EXTERNAL_DRIVER_CHECK=y
 
 # Increase the maximum number of sectors to 512 to fit the big image size (> 1024 kB).
diff --git a/samples/matter/light_switch/sysbuild/mcuboot/boards/nrf7002dk_nrf5340_cpuapp.conf b/samples/matter/light_switch/sysbuild/mcuboot/boards/nrf7002dk_nrf5340_cpuapp.conf
@@ -11,7 +11,6 @@ CONFIG_SPI_NOR=y
 CONFIG_SPI_NOR_SFDP_DEVICETREE=y
 CONFIG_SPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096
 
-CONFIG_MULTITHREADING=y
 CONFIG_PM_OVERRIDE_EXTERNAL_DRIVER_CHECK=y
 
 # The following configurations are required to support simultaneous multi image update
diff --git a/samples/matter/lock/sysbuild/mcuboot/boards/nrf54l15dk_nrf54l15_cpuapp.conf b/samples/matter/lock/sysbuild/mcuboot/boards/nrf54l15dk_nrf54l15_cpuapp.conf
@@ -16,9 +16,6 @@ CONFIG_SPI_NOR=y
 CONFIG_SPI_NOR_SFDP_DEVICETREE=y
 CONFIG_SPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096
 
-# required by SPI driver
-CONFIG_MULTITHREADING=y
-
 CONFIG_PM_OVERRIDE_EXTERNAL_DRIVER_CHECK=y
 
 # Adjust the maximum sectors to the app image size of ~1.4MB
diff --git a/samples/matter/lock/sysbuild/mcuboot/boards/nrf54lm20dk_nrf54lm20a_cpuapp.conf b/samples/matter/lock/sysbuild/mcuboot/boards/nrf54lm20dk_nrf54lm20a_cpuapp.conf
@@ -13,7 +13,6 @@ CONFIG_SPI=y
 CONFIG_SPI_NOR=y
 CONFIG_SPI_NOR_SFDP_DEVICETREE=y
 CONFIG_SPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096
-CONFIG_MULTITHREADING=y
 CONFIG_PM_OVERRIDE_EXTERNAL_DRIVER_CHECK=y
 
 # Increase the maximum number of sectors to 512 to fit the big image size (> 1024 kB).
diff --git a/samples/matter/lock/sysbuild/mcuboot/boards/nrf7002dk_nrf5340_cpuapp.conf b/samples/matter/lock/sysbuild/mcuboot/boards/nrf7002dk_nrf5340_cpuapp.conf
@@ -11,7 +11,6 @@ CONFIG_SPI_NOR=y
 CONFIG_SPI_NOR_SFDP_DEVICETREE=y
 CONFIG_SPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096
 
-CONFIG_MULTITHREADING=y
 CONFIG_PM_OVERRIDE_EXTERNAL_DRIVER_CHECK=y
 
 # The following configurations are required to support simultaneous multi image update
diff --git a/samples/matter/manufacturer_specific/sysbuild/mcuboot/boards/nrf54l15dk_nrf54l10_cpuapp.conf b/samples/matter/manufacturer_specific/sysbuild/mcuboot/boards/nrf54l15dk_nrf54l10_cpuapp.conf
@@ -16,9 +16,6 @@ CONFIG_SPI_NOR=y
 CONFIG_SPI_NOR_SFDP_DEVICETREE=y
 CONFIG_SPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096
 
-# required by SPI driver
-CONFIG_MULTITHREADING=y
-
 CONFIG_PM_OVERRIDE_EXTERNAL_DRIVER_CHECK=y
 
 # Currently, without tickless kernel, the SYSCOUNTER value after the software
diff --git a/samples/matter/manufacturer_specific/sysbuild/mcuboot/boards/nrf54l15dk_nrf54l15_cpuapp.conf b/samples/matter/manufacturer_specific/sysbuild/mcuboot/boards/nrf54l15dk_nrf54l15_cpuapp.conf
@@ -16,9 +16,6 @@ CONFIG_SPI_NOR=y
 CONFIG_SPI_NOR_SFDP_DEVICETREE=y
 CONFIG_SPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096
 
-# required by SPI driver
-CONFIG_MULTITHREADING=y
-
 CONFIG_PM_OVERRIDE_EXTERNAL_DRIVER_CHECK=y
 
 # Adjust the maximum sectors to the app image size of ~1.4MB
diff --git a/samples/matter/manufacturer_specific/sysbuild/mcuboot/boards/nrf54lm20dk_nrf54lm20a_cpuapp.conf b/samples/matter/manufacturer_specific/sysbuild/mcuboot/boards/nrf54lm20dk_nrf54lm20a_cpuapp.conf
@@ -13,7 +13,6 @@ CONFIG_SPI=y
 CONFIG_SPI_NOR=y
 CONFIG_SPI_NOR_SFDP_DEVICETREE=y
 CONFIG_SPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096
-CONFIG_MULTITHREADING=y
 CONFIG_PM_OVERRIDE_EXTERNAL_DRIVER_CHECK=y
 
 # Increase the maximum number of sectors to 512 to fit the big image size (> 1024 kB).
diff --git a/samples/matter/manufacturer_specific/sysbuild/mcuboot/boards/nrf7002dk_nrf5340_cpuapp.conf b/samples/matter/manufacturer_specific/sysbuild/mcuboot/boards/nrf7002dk_nrf5340_cpuapp.conf
@@ -11,7 +11,6 @@ CONFIG_SPI_NOR=y
 CONFIG_SPI_NOR_SFDP_DEVICETREE=y
 CONFIG_SPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096
 
-CONFIG_MULTITHREADING=y
 CONFIG_PM_OVERRIDE_EXTERNAL_DRIVER_CHECK=y
 
 # The following configurations are required to support simultaneous multi image update
diff --git a/samples/matter/smoke_co_alarm/sysbuild/mcuboot/boards/nrf54l15dk_nrf54l10_cpuapp.conf b/samples/matter/smoke_co_alarm/sysbuild/mcuboot/boards/nrf54l15dk_nrf54l10_cpuapp.conf
@@ -16,9 +16,6 @@ CONFIG_SPI_NOR=y
 CONFIG_SPI_NOR_SFDP_DEVICETREE=y
 CONFIG_SPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096
 
-# required by SPI driver
-CONFIG_MULTITHREADING=y
-
 CONFIG_PM_OVERRIDE_EXTERNAL_DRIVER_CHECK=y
 
 # Currently, without tickless kernel, the SYSCOUNTER value after the software
diff --git a/samples/matter/smoke_co_alarm/sysbuild/mcuboot/boards/nrf54l15dk_nrf54l15_cpuapp.conf b/samples/matter/smoke_co_alarm/sysbuild/mcuboot/boards/nrf54l15dk_nrf54l15_cpuapp.conf
@@ -16,9 +16,6 @@ CONFIG_SPI_NOR=y
 CONFIG_SPI_NOR_SFDP_DEVICETREE=y
 CONFIG_SPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096
 
-# required by SPI driver
-CONFIG_MULTITHREADING=y
-
 CONFIG_PM_OVERRIDE_EXTERNAL_DRIVER_CHECK=y
 
 # Adjust the maximum sectors to the app image size of ~1.4MB
diff --git a/samples/matter/smoke_co_alarm/sysbuild/mcuboot/boards/nrf54lm20dk_nrf54lm20a_cpuapp.conf b/samples/matter/smoke_co_alarm/sysbuild/mcuboot/boards/nrf54lm20dk_nrf54lm20a_cpuapp.conf
@@ -13,7 +13,6 @@ CONFIG_SPI=y
 CONFIG_SPI_NOR=y
 CONFIG_SPI_NOR_SFDP_DEVICETREE=y
 CONFIG_SPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096
-CONFIG_MULTITHREADING=y
 CONFIG_PM_OVERRIDE_EXTERNAL_DRIVER_CHECK=y
 
 # Increase the maximum number of sectors to 512 to fit the big image size (> 1024 kB).
diff --git a/samples/matter/template/sysbuild/mcuboot/boards/nrf54l15dk_nrf54l10_cpuapp.conf b/samples/matter/template/sysbuild/mcuboot/boards/nrf54l15dk_nrf54l10_cpuapp.conf
@@ -16,9 +16,6 @@ CONFIG_SPI_NOR=y
 CONFIG_SPI_NOR_SFDP_DEVICETREE=y
 CONFIG_SPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096
 
-# required by SPI driver
-CONFIG_MULTITHREADING=y
-
 CONFIG_PM_OVERRIDE_EXTERNAL_DRIVER_CHECK=y
 
 # Currently, without tickless kernel, the SYSCOUNTER value after the software
diff --git a/samples/matter/template/sysbuild/mcuboot/boards/nrf54l15dk_nrf54l15_cpuapp.conf b/samples/matter/template/sysbuild/mcuboot/boards/nrf54l15dk_nrf54l15_cpuapp.conf
@@ -16,9 +16,6 @@ CONFIG_SPI_NOR=y
 CONFIG_SPI_NOR_SFDP_DEVICETREE=y
 CONFIG_SPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096
 
-# required by SPI driver
-CONFIG_MULTITHREADING=y
-
 CONFIG_PM_OVERRIDE_EXTERNAL_DRIVER_CHECK=y
 
 # Adjust the maximum sectors to the app image size of ~1.4MB
diff --git a/samples/matter/template/sysbuild/mcuboot/boards/nrf54lm20dk_nrf54lm20a_cpuapp.conf b/samples/matter/template/sysbuild/mcuboot/boards/nrf54lm20dk_nrf54lm20a_cpuapp.conf
@@ -13,7 +13,6 @@ CONFIG_SPI=y
 CONFIG_SPI_NOR=y
 CONFIG_SPI_NOR_SFDP_DEVICETREE=y
 CONFIG_SPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096
-CONFIG_MULTITHREADING=y
 CONFIG_PM_OVERRIDE_EXTERNAL_DRIVER_CHECK=y
 
 # Increase the maximum number of sectors to 512 to fit the big image size (> 1024 kB).
diff --git a/samples/matter/template/sysbuild/mcuboot/boards/nrf7002dk_nrf5340_cpuapp.conf b/samples/matter/template/sysbuild/mcuboot/boards/nrf7002dk_nrf5340_cpuapp.conf
@@ -11,7 +11,6 @@ CONFIG_SPI_NOR=y
 CONFIG_SPI_NOR_SFDP_DEVICETREE=y
 CONFIG_SPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096
 
-CONFIG_MULTITHREADING=y
 CONFIG_PM_OVERRIDE_EXTERNAL_DRIVER_CHECK=y
 
 # The following configurations are required to support simultaneous multi image update
diff --git a/samples/matter/thermostat/sysbuild/mcuboot/boards/nrf54l15dk_nrf54l15_cpuapp.conf b/samples/matter/thermostat/sysbuild/mcuboot/boards/nrf54l15dk_nrf54l15_cpuapp.conf
@@ -16,9 +16,6 @@ CONFIG_SPI_NOR=y
 CONFIG_SPI_NOR_SFDP_DEVICETREE=y
 CONFIG_SPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096
 
-# required by SPI driver
-CONFIG_MULTITHREADING=y
-
 CONFIG_PM_OVERRIDE_EXTERNAL_DRIVER_CHECK=y
 
 # Adjust the maximum sectors to the app image size of ~1.4MB
diff --git a/samples/matter/thermostat/sysbuild/mcuboot/boards/nrf54lm20dk_nrf54lm20a_cpuapp.conf b/samples/matter/thermostat/sysbuild/mcuboot/boards/nrf54lm20dk_nrf54lm20a_cpuapp.conf
@@ -13,7 +13,6 @@ CONFIG_SPI=y
 CONFIG_SPI_NOR=y
 CONFIG_SPI_NOR_SFDP_DEVICETREE=y
 CONFIG_SPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096
-CONFIG_MULTITHREADING=y
 CONFIG_PM_OVERRIDE_EXTERNAL_DRIVER_CHECK=y
 
 # Increase the maximum number of sectors to 512 to fit the big image size (> 1024 kB).
diff --git a/samples/matter/thermostat/sysbuild/mcuboot/boards/nrf7002dk_nrf5340_cpuapp.conf b/samples/matter/thermostat/sysbuild/mcuboot/boards/nrf7002dk_nrf5340_cpuapp.conf
@@ -11,7 +11,6 @@ CONFIG_SPI_NOR=y
 CONFIG_SPI_NOR_SFDP_DEVICETREE=y
 CONFIG_SPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096
 
-CONFIG_MULTITHREADING=y
 CONFIG_PM_OVERRIDE_EXTERNAL_DRIVER_CHECK=y
 
 # The following configurations are required to support simultaneous multi image update
diff --git a/samples/matter/window_covering/sysbuild/mcuboot/boards/nrf54l15dk_nrf54l15_cpuapp.conf b/samples/matter/window_covering/sysbuild/mcuboot/boards/nrf54l15dk_nrf54l15_cpuapp.conf
@@ -16,9 +16,6 @@ CONFIG_SPI_NOR=y
 CONFIG_SPI_NOR_SFDP_DEVICETREE=y
 CONFIG_SPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096
 
-# required by SPI driver
-CONFIG_MULTITHREADING=y
-
 CONFIG_PM_OVERRIDE_EXTERNAL_DRIVER_CHECK=y
 
 # Adjust the maximum sectors to the app image size of ~1.4MB
diff --git a/samples/matter/window_covering/sysbuild/mcuboot/boards/nrf54lm20dk_nrf54lm20a_cpuapp.conf b/samples/matter/window_covering/sysbuild/mcuboot/boards/nrf54lm20dk_nrf54lm20a_cpuapp.conf
@@ -13,7 +13,6 @@ CONFIG_SPI=y
 CONFIG_SPI_NOR=y
 CONFIG_SPI_NOR_SFDP_DEVICETREE=y
 CONFIG_SPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096
-CONFIG_MULTITHREADING=y
 CONFIG_PM_OVERRIDE_EXTERNAL_DRIVER_CHECK=y
 
 # Increase the maximum number of sectors to 512 to fit the big image size (> 1024 kB).
diff --git a/samples/matter/window_covering/sysbuild/mcuboot/boards/nrf7002dk_nrf5340_cpuapp.conf b/samples/matter/window_covering/sysbuild/mcuboot/boards/nrf7002dk_nrf5340_cpuapp.conf
@@ -11,7 +11,6 @@ CONFIG_SPI_NOR=y
 CONFIG_SPI_NOR_SFDP_DEVICETREE=y
 CONFIG_SPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096
 
-CONFIG_MULTITHREADING=y
 CONFIG_PM_OVERRIDE_EXTERNAL_DRIVER_CHECK=y
 
 # The following configurations are required to support simultaneous multi image update
diff --git a/samples/net/aws_iot/sysbuild/mcuboot/boards/nrf7002dk_nrf5340_cpuapp.conf b/samples/net/aws_iot/sysbuild/mcuboot/boards/nrf7002dk_nrf5340_cpuapp.conf
@@ -8,7 +8,6 @@
 
 # General
 CONFIG_FLASH=y
-CONFIG_MULTITHREADING=y
 CONFIG_MAIN_STACK_SIZE=4096
 CONFIG_NRF_RTC_TIMER_USER_CHAN_COUNT=0
 
diff --git a/samples/net/aws_iot/sysbuild/mcuboot/boards/thingy91x_nrf9151.conf b/samples/net/aws_iot/sysbuild/mcuboot/boards/thingy91x_nrf9151.conf
@@ -11,7 +11,6 @@ CONFIG_SPI=y
 CONFIG_SPI_NOR=y
 CONFIG_SPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096
 CONFIG_SPI_NOR_SFDP_DEVICETREE=y
-CONFIG_MULTITHREADING=y
 
 # Disable Zephyr console and use UART for MCUboot serial recovery instead
 CONFIG_CONSOLE=n
diff --git a/samples/net/azure_iot_hub/sysbuild/mcuboot/boards/nrf7002dk_nrf5340_cpuapp.conf b/samples/net/azure_iot_hub/sysbuild/mcuboot/boards/nrf7002dk_nrf5340_cpuapp.conf
@@ -8,7 +8,6 @@
 
 # General
 CONFIG_FLASH=y
-CONFIG_MULTITHREADING=y
 CONFIG_MAIN_STACK_SIZE=4096
 
 # SPI
diff --git a/samples/nrf5340/extxip_smp_svr/sysbuild/mcuboot/boards/thingy53_nrf5340_cpuapp.conf b/samples/nrf5340/extxip_smp_svr/sysbuild/mcuboot/boards/thingy53_nrf5340_cpuapp.conf
@@ -31,7 +31,7 @@ CONFIG_NORDIC_QSPI_NOR=y
 CONFIG_NORDIC_QSPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096
 CONFIG_NORDIC_QSPI_NOR_STACK_WRITE_BUFFER_SIZE=16
 
-# Required by USB and QSPI
+# Required by USB
 CONFIG_MULTITHREADING=y
 
 # USB
diff --git a/samples/wifi/shell/sysbuild/mcuboot/boards/thingy53_nrf5340_cpuapp.conf b/samples/wifi/shell/sysbuild/mcuboot/boards/thingy53_nrf5340_cpuapp.conf
@@ -39,7 +39,7 @@ CONFIG_NORDIC_QSPI_NOR=y
 CONFIG_NORDIC_QSPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096
 CONFIG_NORDIC_QSPI_NOR_STACK_WRITE_BUFFER_SIZE=16
 
-# Required by USB and QSPI
+# Required by USB
 CONFIG_MULTITHREADING=y
 
 # USB
diff --git a/samples/wifi/shell/sysbuild/mcuboot/boards/thingy91x_nrf9151.conf b/samples/wifi/shell/sysbuild/mcuboot/boards/thingy91x_nrf9151.conf
diff --git a/snippets/nrf70-fw-patch-ext-flash/boards/nrf7002dk_nrf5340_cpuapp.conf b/snippets/nrf70-fw-patch-ext-flash/boards/nrf7002dk_nrf5340_cpuapp.conf
