Skip to content

Commit 5d6a59c

Browse files
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]>
1 parent 5e20ccc commit 5d6a59c

File tree

5 files changed

+27
-3
lines changed

5 files changed

+27
-3
lines changed

applications/matter_bridge/boards/nrf54h20dk_nrf54h20_cpuapp.conf

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,15 @@ CONFIG_MPU_STACK_GUARD=n
1313
CONFIG_PSA_SSF_CRYPTO_CLIENT=y
1414
CONFIG_SSF_PSA_CRYPTO_SERVICE_ENABLED=y
1515

16+
# Disable Data Cache
17+
CONFIG_DCACHE=n
18+
19+
# Set the ZMS sector count to match the settings partition size that is 32 kB for this application.
20+
CONFIG_SETTINGS_ZMS_SECTOR_COUNT=8
21+
# Workaround required as Zephyr L2 implies usage of NVS backend for settings.
22+
# It should be removed once the proper fix will be applied in Zephyr.
23+
CONFIG_NVS=n
24+
1625
# TODO: Enable factory data once it is available
1726
CONFIG_CHIP_FACTORY_DATA=n
1827

doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -394,8 +394,11 @@ Keys samples
394394
Matter samples
395395
--------------
396396

397-
* Updated all Matter samples that support low-power mode to enable the :ref:`lib_ram_pwrdn` feature.
398-
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.
397+
* Updated:
398+
399+
* All Matter samples that support low-power mode to enable the :ref:`lib_ram_pwrdn` feature.
400+
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.
401+
* All Matter samples to enable the ZMS file subsystem in all devices that contain MRAM, such as the nRF54H Series devices.
399402

400403
* Disabled pausing Matter watchdog while CPU is in idle state in all Matter samples.
401404
To enable it set the :kconfig:option:`CONFIG_NCS_SAMPLE_MATTER_WATCHDOG_PAUSE_IN_SLEEP` Kconfig option to ``y``.

samples/matter/lock/boards/nrf54h20dk_nrf54h20_cpuapp.conf

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,12 @@ CONFIG_DCACHE=n
1818
# It will add the application firmware to the cache partition.
1919
CONFIG_SUIT_DFU_CACHE_EXTRACT_IMAGE=y
2020

21+
# Set the ZMS sector count to match the settings partition size that is 32 kB for this application.
22+
CONFIG_SETTINGS_ZMS_SECTOR_COUNT=8
23+
# Workaround required as Zephyr L2 implies usage of NVS backend for settings.
24+
# It should be removed once the proper fix will be applied in Zephyr.
25+
CONFIG_NVS=n
26+
2127
# TODO: Enable factory data once it is available
2228
CONFIG_CHIP_FACTORY_DATA=n
2329
CONFIG_CHIP_CRYPTO_PSA_MIGRATE_DAC_PRIV_KEY=n

samples/matter/template/boards/nrf54h20dk_nrf54h20_cpuapp.conf

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,12 @@ CONFIG_SSF_PSA_CRYPTO_SERVICE_ENABLED=y
1414
# Disable Data Cache
1515
CONFIG_DCACHE=n
1616

17+
# Set the ZMS sector count to match the settings partition size that is 32 kB for this application.
18+
CONFIG_SETTINGS_ZMS_SECTOR_COUNT=8
19+
# Workaround required as Zephyr L2 implies usage of NVS backend for settings.
20+
# It should be removed once the proper fix will be applied in Zephyr.
21+
CONFIG_NVS=n
22+
1723
# Enable cache processing for application core.
1824
# It will add the application firmware to the cache partition.
1925
CONFIG_SUIT_DFU_CACHE_EXTRACT_IMAGE=y

west.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ manifest:
158158
- name: matter
159159
repo-path: sdk-connectedhomeip
160160
path: modules/lib/matter
161-
revision: 6c1a9c51256fa3bea98bcdbf31d8a6aeef006a19
161+
revision: 9a6edcf725a9766e513fe789745da92e0f640cb1
162162
west-commands: scripts/west/west-commands.yml
163163
submodules:
164164
- name: nlio

0 commit comments

Comments
 (0)