samples: matter: Moved the common configs to the defauls

Removed the common mpsl stack size config to the Kconfig.defaults. Additionally removed some configuration leftover for the 54L10. Signed-off-by: Kamil Kasperczyk <[email protected]>
nrfconnect · Jan 20, 2025 · 94d0ba9 · 94d0ba9
1 parent 8571f61
commit 94d0ba9
Show file tree

Hide file tree

Showing 17 changed files with 1 addition and 51 deletions.
diff --git a/samples/matter/light_bulb/boards/nrf54l15dk_nrf54l15_cpuapp.conf b/samples/matter/light_bulb/boards/nrf54l15dk_nrf54l15_cpuapp.conf
@@ -7,9 +7,6 @@
 # Multirole is the only currently supported role by SoftDevice.
 CONFIG_BT_LL_SOFTDEVICE_MULTIROLE=y
 
-# nRF54L15 requires bigger stack sizes than nRF52/nRF53 families
-CONFIG_MPSL_WORK_STACK_SIZE=2048
-
 # Set the ZMS sector count to match the settings partition size that is 40 kB for this application.
 CONFIG_SETTINGS_ZMS_SECTOR_COUNT=10
 

diff --git a/samples/matter/light_bulb/boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf b/samples/matter/light_bulb/boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf
@@ -13,9 +13,6 @@ CONFIG_CHIP_FACTORY_DATA_WRITE_PROTECT=n
 # TODO: KRKNWK-19382: Disable NFC commissioning due to an issue with definitions for ns build.
 CONFIG_CHIP_NFC_COMMISSIONING=n
 
-# nRF54L15 requires bigger stack sizes than nRF52/nRF53 families
-CONFIG_MPSL_WORK_STACK_SIZE=2048
-
 # Set the ZMS sector count to match the settings partition size that is 40 kB for this application.
 CONFIG_SETTINGS_ZMS_SECTOR_COUNT=10
 # Workaround required as Zephyr L2 implies usage of NVS backend for settings.

diff --git a/samples/matter/light_switch/boards/nrf54l15dk_nrf54l15_cpuapp.conf b/samples/matter/light_switch/boards/nrf54l15dk_nrf54l15_cpuapp.conf
@@ -7,9 +7,6 @@
 # Multirole is the only currently supported role by SoftDevice.
 CONFIG_BT_LL_SOFTDEVICE_MULTIROLE=y
 
-# nRF54L15 requires bigger stack sizes than nRF52/nRF53 families
-CONFIG_MPSL_WORK_STACK_SIZE=2048
-
 # Set the ZMS sector count to match the settings partition size that is 40 kB for this application.
 CONFIG_SETTINGS_ZMS_SECTOR_COUNT=10
 # Workaround required as Zephyr L2 implies usage of NVS backend for settings.

diff --git a/samples/matter/light_switch/boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf b/samples/matter/light_switch/boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf
@@ -13,9 +13,6 @@ CONFIG_CHIP_FACTORY_DATA_WRITE_PROTECT=n
 # TODO: KRKNWK-19382: Disable NFC commissioning due to an issue with definitions for ns build.
 CONFIG_CHIP_NFC_COMMISSIONING=n
 
-# nRF54L15 requires bigger stack sizes than nRF52/nRF53 families
-CONFIG_MPSL_WORK_STACK_SIZE=2048
-
 # Set the ZMS sector count to match the settings partition size that is 40 kB for this application.
 CONFIG_SETTINGS_ZMS_SECTOR_COUNT=10
 # Workaround required as Zephyr L2 implies usage of NVS backend for settings.

diff --git a/samples/matter/lock/boards/nrf54l15dk_nrf54l15_cpuapp.conf b/samples/matter/lock/boards/nrf54l15dk_nrf54l15_cpuapp.conf
@@ -7,9 +7,6 @@
 # Multirole is the only currently supported role by SoftDevice.
 CONFIG_BT_LL_SOFTDEVICE_MULTIROLE=y
 
-# nRF54L15 requires bigger stack sizes than nRF52/nRF53 families
-CONFIG_MPSL_WORK_STACK_SIZE=2048
-
 # Set the ZMS sector count to match the settings partition size that is 40 kB for this application.
 CONFIG_SETTINGS_ZMS_SECTOR_COUNT=10
 # Workaround required as Zephyr L2 implies usage of NVS backend for settings.

diff --git a/samples/matter/lock/boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf b/samples/matter/lock/boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf
@@ -13,9 +13,6 @@ CONFIG_CHIP_FACTORY_DATA_WRITE_PROTECT=n
 # TODO: KRKNWK-19382: Disable NFC commissioning due to an issue with definitions for ns build.
 CONFIG_CHIP_NFC_COMMISSIONING=n
 
-# nRF54L15 requires bigger stack sizes than nRF52/nRF53 families
-CONFIG_MPSL_WORK_STACK_SIZE=2048
-
 # Set the ZMS sector count to match the settings partition size that is 40 kB for this application.
 CONFIG_SETTINGS_ZMS_SECTOR_COUNT=10
 # Workaround required as Zephyr L2 implies usage of NVS backend for settings.

diff --git a/samples/matter/smoke_co_alarm/boards/nrf54l15dk_nrf54l10_cpuapp.conf b/samples/matter/smoke_co_alarm/boards/nrf54l15dk_nrf54l10_cpuapp.conf
@@ -7,10 +7,6 @@
 # Multirole is the only currently supported role by SoftDevice.
 CONFIG_BT_LL_SOFTDEVICE_MULTIROLE=y
 
-# nRF54L15 requires bigger stack sizes than nRF52/nRF53 families
-CONFIG_CHIP_MALLOC_SYS_HEAP_SIZE=10240
-CONFIG_MPSL_WORK_STACK_SIZE=2048
-
 # Set the ZMS sector count to match the settings partition size that is 40 kB for this application.
 CONFIG_SETTINGS_ZMS_SECTOR_COUNT=10
 # Workaround required as Zephyr L2 implies usage of NVS backend for settings.

diff --git a/samples/matter/smoke_co_alarm/boards/nrf54l15dk_nrf54l15_cpuapp.conf b/samples/matter/smoke_co_alarm/boards/nrf54l15dk_nrf54l15_cpuapp.conf
@@ -7,9 +7,6 @@
 # Multirole is the only currently supported role by SoftDevice.
 CONFIG_BT_LL_SOFTDEVICE_MULTIROLE=y
 
-# nRF54L15 requires bigger stack sizes than nRF52/nRF53 families
-CONFIG_MPSL_WORK_STACK_SIZE=2048
-
 # Set the ZMS sector count to match the settings partition size that is 40 kB for this application.
 CONFIG_SETTINGS_ZMS_SECTOR_COUNT=10
 # Workaround required as Zephyr L2 implies usage of NVS backend for settings.

diff --git a/samples/matter/template/boards/nrf54l15dk_nrf54l10_cpuapp.conf b/samples/matter/template/boards/nrf54l15dk_nrf54l10_cpuapp.conf
@@ -7,10 +7,6 @@
 # Multirole is the only currently supported role by SoftDevice.
 CONFIG_BT_LL_SOFTDEVICE_MULTIROLE=y
 
-# nRF54L15 requires bigger stack sizes than nRF52/nRF53 families
-CONFIG_CHIP_MALLOC_SYS_HEAP_SIZE=10240
-CONFIG_MPSL_WORK_STACK_SIZE=2048
-
 # Set the ZMS sector count to match the settings partition size that is 40 kB for this application.
 CONFIG_SETTINGS_ZMS_SECTOR_COUNT=10
 

diff --git a/samples/matter/template/boards/nrf54l15dk_nrf54l15_cpuapp.conf b/samples/matter/template/boards/nrf54l15dk_nrf54l15_cpuapp.conf
@@ -7,9 +7,6 @@
 # Multirole is the only currently supported role by SoftDevice.
 CONFIG_BT_LL_SOFTDEVICE_MULTIROLE=y
 
-# nRF54L15 requires bigger stack sizes than nRF52/nRF53 families
-CONFIG_MPSL_WORK_STACK_SIZE=2048
-
 # Set the ZMS sector count to match the settings partition size that is 40 kB for this application.
 CONFIG_SETTINGS_ZMS_SECTOR_COUNT=10
 

diff --git a/samples/matter/template/boards/nrf54l15dk_nrf54l15_cpuapp_internal.conf b/samples/matter/template/boards/nrf54l15dk_nrf54l15_cpuapp_internal.conf
@@ -7,9 +7,6 @@
 # Multirole is the only currently supported role by SoftDevice.
 CONFIG_BT_LL_SOFTDEVICE_MULTIROLE=y
 
-# nRF54L15 requires bigger stack sizes than nRF52/nRF53 families
-CONFIG_MPSL_WORK_STACK_SIZE=2048
-
 # Set the ZMS sector count to match the settings partition size that is 40 kB for this application.
 CONFIG_SETTINGS_ZMS_SECTOR_COUNT=10
 # Workaround required as Zephyr L2 implies usage of NVS backend for settings.

diff --git a/samples/matter/template/boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf b/samples/matter/template/boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf
@@ -10,9 +10,6 @@ CONFIG_BT_LL_SOFTDEVICE_MULTIROLE=y
 # TODO: Workaround to be removed once Zephyr's CONFIG_FPROTECT is supported on nRF54L_ns
 CONFIG_CHIP_FACTORY_DATA_WRITE_PROTECT=n
 
-# nRF54L15 requires bigger stack sizes than nRF52/nRF53 families
-CONFIG_MPSL_WORK_STACK_SIZE=2048
-
 # Set the ZMS sector count to match the settings partition size that is 40 kB for this application.
 CONFIG_SETTINGS_ZMS_SECTOR_COUNT=10
 # Workaround required as Zephyr L2 implies usage of NVS backend for settings.

diff --git a/samples/matter/thermostat/boards/nrf54l15dk_nrf54l15_cpuapp.conf b/samples/matter/thermostat/boards/nrf54l15dk_nrf54l15_cpuapp.conf
@@ -7,9 +7,6 @@
 # Multirole is the only currently supported role by SoftDevice.
 CONFIG_BT_LL_SOFTDEVICE_MULTIROLE=y
 
-# nRF54L15 requires bigger stack sizes than nRF52/nRF53 families
-CONFIG_MPSL_WORK_STACK_SIZE=2048
-
 # Set the ZMS sector count to match the settings partition size that is 40 kB for this application.
 CONFIG_SETTINGS_ZMS_SECTOR_COUNT=10
 

diff --git a/samples/matter/thermostat/boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf b/samples/matter/thermostat/boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf
@@ -13,9 +13,6 @@ CONFIG_CHIP_FACTORY_DATA_WRITE_PROTECT=n
 # TODO: KRKNWK-19382: Disable NFC commissioning due to an issue with definitions for ns build.
 CONFIG_CHIP_NFC_COMMISSIONING=n
 
-# nRF54L15 requires bigger stack sizes than nRF52/nRF53 families
-CONFIG_MPSL_WORK_STACK_SIZE=2048
-
 # Set the ZMS sector count to match the settings partition size that is 40 kB for this application.
 CONFIG_SETTINGS_ZMS_SECTOR_COUNT=10
 # Workaround required as Zephyr L2 implies usage of NVS backend for settings.

diff --git a/samples/matter/window_covering/boards/nrf54l15dk_nrf54l15_cpuapp.conf b/samples/matter/window_covering/boards/nrf54l15dk_nrf54l15_cpuapp.conf
@@ -7,9 +7,6 @@
 # Multirole is the only currently supported role by SoftDevice.
 CONFIG_BT_LL_SOFTDEVICE_MULTIROLE=y
 
-# nRF54L15 requires bigger stack sizes than nRF52/nRF53 families
-CONFIG_MPSL_WORK_STACK_SIZE=2048
-
 # Set the ZMS sector count to match the settings partition size that is 40 kB for this application.
 CONFIG_SETTINGS_ZMS_SECTOR_COUNT=10
 # Workaround required as Zephyr L2 implies usage of NVS backend for settings.

diff --git a/samples/matter/window_covering/boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf b/samples/matter/window_covering/boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf
@@ -13,9 +13,6 @@ CONFIG_CHIP_FACTORY_DATA_WRITE_PROTECT=n
 # TODO: KRKNWK-19382: Disable NFC commissioning due to an issue with definitions for ns build.
 CONFIG_CHIP_NFC_COMMISSIONING=n
 
-# nRF54L15 requires bigger stack sizes than nRF52/nRF53 families
-CONFIG_MPSL_WORK_STACK_SIZE=2048
-
 # Set the ZMS sector count to match the settings partition size that is 40 kB for this application.
 CONFIG_SETTINGS_ZMS_SECTOR_COUNT=10
 # Workaround required as Zephyr L2 implies usage of NVS backend for settings.

diff --git a/west.yml b/west.yml
@@ -159,7 +159,7 @@ manifest:
     - name: matter
       repo-path: sdk-connectedhomeip
       path: modules/lib/matter
-      revision: 36d3ddf55de6cb700e859af8a519253fa7dd7712
+      revision: pull/534/head
       west-commands: scripts/west/west-commands.yml
       submodules:
         - name: nlio