samples: matter: Gate DfuOverSmp on CHIP_DFU_OVER_BT_SMP

Build and use DfuOverSmp only when CONFIG_CHIP_DFU_OVER_BT_SMP is
enabled. This allows CONFIG_MCUMGR_TRANSPORT_BT to be enabled without
pulling in Matter DFU over SMP support.

Signed-off-by: Adrian Gielniewski <adrian.gielniewski@nordicsemi.no>

Author: adigie

applications/matter_weather_station/src/app_task.cpp

@@ -17,7 +17,7 @@
 #include "board/led_widget.h"
 #include "clusters/identify.h"
 
-#ifdef CONFIG_MCUMGR_TRANSPORT_BT
+#ifdef CONFIG_CHIP_DFU_OVER_BT_SMP
 #include "dfu/smp/dfu_over_smp.h"
 #endif
 
@@ -372,7 +372,7 @@ void AppTask::UpdateLedState()
 CHIP_ERROR AppTask::Init()
 {
 	/* Initialize Matter stack */
-#ifdef CONFIG_MCUMGR_TRANSPORT_BT
+#ifdef CONFIG_CHIP_DFU_OVER_BT_SMP
 	ReturnErrorOnFailure(
 		Nrf::Matter::PrepareServer(Nrf::Matter::InitData{ .mPostServerInitClbk = []() -> CHIP_ERROR {
 			Nrf::GetDFUOverSMP().StartServer();

samples/matter/common/cmake/source_common.cmake

@@ -32,7 +32,7 @@ if(CONFIG_PWM)
     target_sources(app PRIVATE ${MATTER_COMMONS_SRC_DIR}/pwm/pwm_device.cpp)
 endif()
 
-if(CONFIG_MCUMGR_TRANSPORT_BT)
+if(CONFIG_CHIP_DFU_OVER_BT_SMP)
     target_sources(app PRIVATE ${MATTER_COMMONS_SRC_DIR}/dfu/smp/dfu_over_smp.cpp)
     zephyr_library_link_libraries(MCUBOOT_BOOTUTIL)
 endif()

samples/matter/common/src/app/matter_init.cpp

@@ -23,7 +23,7 @@
 #include "dfu/ota/ota_util.h"
 #endif
 
-#ifdef CONFIG_MCUMGR_TRANSPORT_BT
+#ifdef CONFIG_CHIP_DFU_OVER_BT_SMP
 #include "dfu/smp/dfu_over_smp.h"
 #endif
 
@@ -265,7 +265,7 @@ void DoInitChipServer(intptr_t /* unused */)
 	Nrf::Matter::OtaConfirmNewImage();
 #endif
 
-#ifdef CONFIG_MCUMGR_TRANSPORT_BT
+#ifdef CONFIG_CHIP_DFU_OVER_BT_SMP
 	/* Initialize DFU over SMP */
 	Nrf::GetDFUOverSMP().Init();
 	Nrf::GetDFUOverSMP().ConfirmNewImage();

samples/matter/common/src/board/board.cpp

@@ -13,7 +13,7 @@
 
 #include <zephyr/logging/log.h>
 
-#ifdef CONFIG_MCUMGR_TRANSPORT_BT
+#ifdef CONFIG_CHIP_DFU_OVER_BT_SMP
 #include "dfu/smp/dfu_over_smp.h"
 #endif
 
@@ -278,7 +278,7 @@ void Board::StartBLEAdvertisementHandler(const ButtonAction &action)
 	if (action == ButtonAction::Pressed) {
 		if (sInstance.mState == DeviceState::DeviceProvisioned) {
 /* In this case we need to run only Bluetooth LE SMP advertising if it is available */
-#ifdef CONFIG_MCUMGR_TRANSPORT_BT
+#ifdef CONFIG_CHIP_DFU_OVER_BT_SMP
 			GetDFUOverSMP().StartServer();
 #else
 			LOG_INF("Software update is disabled");

samples/matter/temperature_sensor/src/app_task.cpp

@@ -79,7 +79,7 @@ void AppTask::ButtonEventHandler(Nrf::ButtonState state, Nrf::ButtonMask hasChan
 #ifndef CONFIG_NCS_SAMPLE_MATTER_CUSTOM_BLUETOOTH_ADVERTISING
 				if (Nrf::GetBoard().GetDeviceState() == Nrf::DeviceState::DeviceProvisioned) {
 /* In this case we need to run only Bluetooth LE SMP advertising if it is available */
-#ifdef CONFIG_MCUMGR_TRANSPORT_BT
+#ifdef CONFIG_CHIP_DFU_OVER_BT_SMP
 					GetDFUOverSMP().StartServer();
 #else
 					LOG_INF("Software update is disabled");