From 9daba3b94362a8bbaca54c255de2819192983848 Mon Sep 17 00:00:00 2001 From: Arkadiusz Balys Date: Fri, 29 Nov 2024 11:01:17 +0100 Subject: [PATCH] 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 --- .../matter_bridge/boards/nrf54h20dk_nrf54h20_cpuapp.conf | 9 +++++++++ .../releases/release-notes-changelog.rst | 2 ++ .../matter/lock/boards/nrf54h20dk_nrf54h20_cpuapp.conf | 6 ++++++ .../template/boards/nrf54h20dk_nrf54h20_cpuapp.conf | 6 ++++++ west.yml | 2 +- 5 files changed, 24 insertions(+), 1 deletion(-) diff --git a/applications/matter_bridge/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/applications/matter_bridge/boards/nrf54h20dk_nrf54h20_cpuapp.conf index 29da5cee4e04..faadce343145 100644 --- 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 index e4179098827a..1a6a4e64d5fc 100644 --- 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 index 629b740133dc..e7f4cc7e81b8 100644 --- 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 index f79f1a8844fa..4398f7d851ea 100644 --- 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 index 7dcd1918391d..55a655af2adf 100644 --- 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