[nrf toup][nrfconnect] Fix all-clusters-* apps configuration

adigie · adigie · commit 2c815545407a · 2025-03-20T14:48:45.000+01:00
Signed-off-by: Adrian Gielniewski &lt;adrian.gielniewski@nordicsemi.no&gt;
diff --git a/examples/all-clusters-app/nrfconnect/Kconfig.sysbuild b/examples/all-clusters-app/nrfconnect/Kconfig.sysbuild
@@ -26,6 +26,14 @@ config NETCORE_IPC_RADIO_IEEE802154
 config NETCORE_IPC_RADIO_BT_HCI_IPC
 	default y if SOC_SERIES_NRF53X
 
+config MATTER_OTA
+	default n if BOARD_NRF52840DONGLE_NRF52840
+
+#### Bootloader
+choice BOOTLOADER
+	default BOOTLOADER_MCUBOOT if !BOARD_NRF52840DONGLE_NRF52840
+endchoice
+
 if BOOTLOADER_MCUBOOT
 
 #### DFU multi-image support
diff --git a/examples/all-clusters-minimal-app/nrfconnect/Kconfig.sysbuild b/examples/all-clusters-minimal-app/nrfconnect/Kconfig.sysbuild
@@ -26,6 +26,14 @@ config NETCORE_IPC_RADIO_IEEE802154
 config NETCORE_IPC_RADIO_BT_HCI_IPC
 	default y if SOC_SERIES_NRF53X
 
+config MATTER_OTA
+	default n if BOARD_NRF52840DONGLE_NRF52840
+
+#### Bootloader
+choice BOOTLOADER
+	default BOOTLOADER_MCUBOOT if !BOARD_NRF52840DONGLE_NRF52840
+endchoice
+
 if BOOTLOADER_MCUBOOT
 
 #### DFU multi-image support
diff --git a/examples/all-clusters-minimal-app/nrfconnect/prj.conf b/examples/all-clusters-minimal-app/nrfconnect/prj.conf
@@ -51,7 +51,3 @@ CONFIG_CHIP_OTA_REQUESTOR=n
 
 # Disable QSPI NOR
 CONFIG_CHIP_QSPI_NOR=n
-
-# Enable Factory Data feature
-CONFIG_CHIP_FACTORY_DATA=y
-CONFIG_CHIP_FACTORY_DATA_BUILD=y
diff --git a/examples/all-clusters-minimal-app/nrfconnect/prj_release.conf b/examples/all-clusters-minimal-app/nrfconnect/prj_release.conf
@@ -55,7 +55,3 @@ CONFIG_ASSERT_VERBOSE=n
 CONFIG_PRINTK=n
 CONFIG_THREAD_NAME=n
 CONFIG_BOOT_BANNER=n
-
-# Enable Factory Data feature
-CONFIG_CHIP_FACTORY_DATA=y
-CONFIG_CHIP_FACTORY_DATA_BUILD=y
