samples: matter: Addressed review comments to the configuration

Introduced several fixes for the configuration recommended
during code review.

Signed-off-by: Kamil Kasperczyk <[email protected]>

Author: kkasperczyk-no

samples/matter/contact_sensor/Kconfig.sysbuild

@@ -60,13 +60,13 @@ config DFU_MULTI_IMAGE_PACKAGE_NET
 
 endif # SOC_SERIES_NRF53X
 
-if BOARD_NRF54L15DK
+if BOARD_NRF54L15DK || BOARD_NRF54LM20DK
 
-# Disable checking the external drivers for nRF54L15 DKs.
+# Disable checking the external drivers for nRF54L15 and nRF54LM20 DKs.
 config PM_OVERRIDE_EXTERNAL_DRIVER_CHECK
 	default y
 
-endif # BOARD_NRF54L15DK
+endif # BOARD_NRF54L15DK || BOARD_NRF54LM20DK
 
 endif # BOOTLOADER_MCUBOOT
 

samples/matter/contact_sensor/boards/nrf52840dk_nrf52840.overlay

@@ -14,18 +14,23 @@
 &adc {
 	status = "disabled";
 };
+
 &uart1 {
 	status = "disabled";
 };
+
 &i2c0 {
 	status = "disabled";
 };
+
 &spi1 {
 	status = "disabled";
 };
+
 &spi3 {
 	status = "disabled";
 };
+
 &usbd {
 	status = "disabled";
 };

samples/matter/contact_sensor/boards/nrf5340dk_nrf5340_cpuapp.overlay

@@ -21,12 +21,15 @@
 &adc {
 	status = "disabled";
 };
+
 &i2c1 {
 	status = "disabled";
 };
+
 &spi2 {
 	status = "disabled";
 };
+
 &usbd {
 	status = "disabled";
 };

samples/matter/contact_sensor/sysbuild/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.conf

@@ -7,19 +7,3 @@
 CONFIG_NORDIC_QSPI_NOR=y
 CONFIG_NORDIC_QSPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096
 CONFIG_NORDIC_QSPI_NOR_STACK_WRITE_BUFFER_SIZE=16
-
-# The following configurations are required to support simultaneous multi image update
-CONFIG_PCD_APP=y
-CONFIG_UPDATEABLE_IMAGE_NUMBER=2
-
-CONFIG_BOOT_SWAP_USING_MOVE=n
-# Multi-image updates do not support image swapping yet.
-CONFIG_BOOT_UPGRADE_ONLY=y
-
-# The network core cannot access external flash directly. The flash simulator must be used to
-# provide a memory region that is used to forward the new firmware to the network core.
-CONFIG_FLASH_SIMULATOR=y
-CONFIG_FLASH_SIMULATOR_DOUBLE_WRITES=y
-CONFIG_FLASH_SIMULATOR_STATS=n
-
-CONFIG_ZCBOR=y

samples/matter/contact_sensor/sysbuild/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.overlay

@@ -11,7 +11,7 @@
 	};
 };
 
-// Disable GPIO forwarder for nRF7002 EK compatibility
+/* Disable GPIO forwarder for nRF7002 EK compatibility */
 &gpio_fwd {
 	status = "disabled";
 };

samples/matter/contact_sensor/sysbuild/mcuboot/boards/nrf54l15dk_nrf54l15_cpuapp.conf

@@ -16,8 +16,6 @@ CONFIG_SPI_NOR=y
 CONFIG_SPI_NOR_SFDP_DEVICETREE=y
 CONFIG_SPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096
 
-CONFIG_PM_OVERRIDE_EXTERNAL_DRIVER_CHECK=y
-
 # Adjust the maximum sectors to the app image size of ~1.4MB
 CONFIG_BOOT_MAX_IMG_SECTORS=512
 

samples/matter/contact_sensor/sysbuild/mcuboot/boards/nrf54l15dk_nrf54l15_cpuapp.overlay

@@ -10,7 +10,7 @@
 	};
 };
 
-// restore full RRAM and SRAM space - by default some parts are dedicated to FLRP
+/* restore full RRAM and SRAM space - by default some parts are dedicated to FLRP */
 &cpuapp_rram {
 	reg = <0x0 DT_SIZE_K(1524)>;
 };

samples/matter/contact_sensor/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_PM_OVERRIDE_EXTERNAL_DRIVER_CHECK=y
 
 # Increase the maximum number of sectors to 512 to fit the big image size (> 1024 kB).
 CONFIG_BOOT_MAX_IMG_SECTORS=512

samples/matter/contact_sensor/sysbuild/mcuboot/boards/nrf54lm20dk_nrf54lm20a_cpuapp.overlay

@@ -10,7 +10,7 @@
 	};
 };
 
-// restore full RRAM and SRAM space - by default some parts are dedicated to FLRP
+/* restore full RRAM and SRAM space - by default some parts are dedicated to FLRP */
 &cpuapp_rram {
 	reg = <0x0 DT_SIZE_K(2036)>;
 };

samples/matter/contact_sensor/sysbuild/mcuboot/boards/nrf54lm20dk_nrf54lm20a_cpuapp_internal.conf

@@ -8,29 +8,16 @@ CONFIG_HW_STACK_PROTECTION=n
 CONFIG_BOOT_WATCHDOG_FEED=n
 
 # Disable all debug features
-CONFIG_USE_SEGGER_RTT=n
-CONFIG_SHELL=n
-CONFIG_OPENTHREAD_SHELL=n
-CONFIG_CONSOLE=n
-CONFIG_UART_CONSOLE=n
-CONFIG_SERIAL=n
-CONFIG_LOG=n
-CONFIG_LOG_MODE_MINIMAL=n
 CONFIG_ASSERT_VERBOSE=n
 CONFIG_ASSERT_NO_FILE_INFO=y
 CONFIG_PRINTK=n
-CONFIG_PRINTK_SYNC=n
-CONFIG_THREAD_NAME=n
-CONFIG_BOOT_BANNER=n
 
 # Bootloader size optimization to fit into 28 KB partition.
 # These options can be safely disabled because in this configuration,
 # the secondary slot resides in the internal RRAM, so features
 # needed to handle the external flash are not needed.
-CONFIG_GPIO=n
 CONFIG_SPI_NOR=n
 CONFIG_SPI=n
-CONFIG_MULTITHREADING=n
 
 # Increase the maximum number of sectors to 512 to fit the big image size (> 1024 kB).
 CONFIG_BOOT_MAX_IMG_SECTORS=512