From 5d6a59cfecb3348a99d48da98f61b1490bfca9a2 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 | 7 +++++-- .../matter/lock/boards/nrf54h20dk_nrf54h20_cpuapp.conf | 6 ++++++ .../template/boards/nrf54h20dk_nrf54h20_cpuapp.conf | 6 ++++++ west.yml | 2 +- 5 files changed, 27 insertions(+), 3 deletions(-) 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 28379cbcb17b..e64c8b28c86d 100644 --- a/doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst +++ b/doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst @@ -394,8 +394,11 @@ Keys samples Matter samples -------------- -* Updated all Matter samples that support low-power mode to enable the :ref:`lib_ram_pwrdn` feature. - It is enabled by default for the release configuration of the :ref:`matter_lock_sample`, :ref:`matter_light_switch_sample`, :ref:`matter_smoke_co_alarm_sample`, and :ref:`matter_window_covering_sample` samples. +* Updated: + + * All Matter samples that support low-power mode to enable the :ref:`lib_ram_pwrdn` feature. + It is enabled by default for the release configuration of the :ref:`matter_lock_sample`, :ref:`matter_light_switch_sample`, :ref:`matter_smoke_co_alarm_sample`, and :ref:`matter_window_covering_sample` samples. + * All Matter samples to enable the ZMS file subsystem in all devices that contain MRAM, such as the nRF54H Series devices. * Disabled pausing Matter watchdog while CPU is in idle state in all Matter samples. To enable it set the :kconfig:option:`CONFIG_NCS_SAMPLE_MATTER_WATCHDOG_PAUSE_IN_SLEEP` Kconfig option to ``y``. 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 0a0f0f2c6dc0..02e927e10027 100644 --- a/west.yml +++ b/west.yml @@ -158,7 +158,7 @@ manifest: - name: matter repo-path: sdk-connectedhomeip path: modules/lib/matter - revision: 6c1a9c51256fa3bea98bcdbf31d8a6aeef006a19 + revision: 9a6edcf725a9766e513fe789745da92e0f640cb1 west-commands: scripts/west/west-commands.yml submodules: - name: nlio