samples: matter: Enable ZMS in nRF54H20

Enabled ZMS as Settings backend for nRF54H20 samples and other MRAM-based device that support it. Signed-off-by: Arkadiusz Balys <[email protected]>
nrfconnect · Dec 2, 2024 · 9daba3b · 9daba3b
1 parent 0da8ac9
commit 9daba3b
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 1 deletion.
diff --git a/applications/matter_bridge/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/applications/matter_bridge/boards/nrf54h20dk_nrf54h20_cpuapp.conf
@@ -13,6 +13,15 @@ CONFIG_MPU_STACK_GUARD=n
 CONFIG_PSA_SSF_CRYPTO_CLIENT=y
 CONFIG_SSF_PSA_CRYPTO_SERVICE_ENABLED=y
 
+# Disable Data Cache
+CONFIG_DCACHE=n
+
+# Set the ZMS sector count to match the settings partition size that is 32 kB for this application.
+CONFIG_SETTINGS_ZMS_SECTOR_COUNT=8
+# Workaround required as Zephyr L2 implies usage of NVS backend for settings.
+# It should be removed once the proper fix will be applied in Zephyr.
+CONFIG_NVS=n
+
 # TODO: Enable factory data once it is available
 CONFIG_CHIP_FACTORY_DATA=n
 

diff --git a/doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst b/doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst
@@ -142,6 +142,8 @@ Matter
   You can use this class to generate the Spake2+ verifier at runtime.
   To use this class, enable the :kconfig:option:`CONFIG_PSA_WANT_ALG_PBKDF2_HMAC` and :kconfig:option:`CONFIG_PSA_WANT_KEY_TYPE_SPAKE2P_KEY_PAIR_DERIVE` Kconfig options.
 
+* Enabled the ZMS file subsystem in all devices that contain MRAM, such as the nRF54H Series devices.
+
 Matter fork
 +++++++++++
 

diff --git a/samples/matter/lock/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/samples/matter/lock/boards/nrf54h20dk_nrf54h20_cpuapp.conf
@@ -18,6 +18,12 @@ CONFIG_DCACHE=n
 # It will add the application firmware to the cache partition.
 CONFIG_SUIT_DFU_CACHE_EXTRACT_IMAGE=y
 
+# Set the ZMS sector count to match the settings partition size that is 32 kB for this application.
+CONFIG_SETTINGS_ZMS_SECTOR_COUNT=8
+# Workaround required as Zephyr L2 implies usage of NVS backend for settings.
+# It should be removed once the proper fix will be applied in Zephyr.
+CONFIG_NVS=n
+
 # TODO: Enable factory data once it is available
 CONFIG_CHIP_FACTORY_DATA=n
 CONFIG_CHIP_CRYPTO_PSA_MIGRATE_DAC_PRIV_KEY=n

diff --git a/samples/matter/template/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/samples/matter/template/boards/nrf54h20dk_nrf54h20_cpuapp.conf
@@ -14,6 +14,12 @@ CONFIG_SSF_PSA_CRYPTO_SERVICE_ENABLED=y
 # Disable Data Cache
 CONFIG_DCACHE=n
 
+# Set the ZMS sector count to match the settings partition size that is 32 kB for this application.
+CONFIG_SETTINGS_ZMS_SECTOR_COUNT=8
+# Workaround required as Zephyr L2 implies usage of NVS backend for settings.
+# It should be removed once the proper fix will be applied in Zephyr.
+CONFIG_NVS=n
+
 # Enable cache processing for application core.
 # It will add the application firmware to the cache partition.
 CONFIG_SUIT_DFU_CACHE_EXTRACT_IMAGE=y

diff --git a/west.yml b/west.yml
@@ -158,7 +158,7 @@ manifest:
     - name: matter
       repo-path: sdk-connectedhomeip
       path: modules/lib/matter
-      revision: 297f762debcfe0d983fcef2dd60cc926e715b17c
+      revision: pull/516/head
       west-commands: scripts/west/west-commands.yml
       submodules:
         - name: nlio