Skip to content

Commit b6c93e1

Browse files
kapi-norlubos
authored andcommitted
applications: nrf_desktop: enable zms for nrf54h20 DK target
Enabled the ZMS file system for the nRF54H20 DK in the nRF Desktop application. All board targets with the MRAM technology now use ZMS by default. Ref: NCSDK-30319 Signed-off-by: Kamil Piszczek <[email protected]>
1 parent 59130f5 commit b6c93e1

File tree

3 files changed

+14
-6
lines changed

3 files changed

+14
-6
lines changed

applications/nrf_desktop/doc/settings_loader.rst

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,11 @@ For details on the default configuration alignment, see the following sections.
3333
Settings backend
3434
================
3535

36-
By default, nRF Desktop devices use non-volatile storage settings backend (:kconfig:option:`CONFIG_SETTINGS_NVS`).
36+
By default, the nRF Desktop application, depending on the non-volatile memory technology used by the device, uses one of the following settings backends:
37+
38+
* :ref:`Zephyr Memory Storage (ZMS) <zephyr:zms_api>` - Used for the devices with non-volatile memory that do not require explicit erase (MRAM, RRAM).
39+
* :ref:`Non-Volatile Storage (NVS) <zephyr:nvs_api>` - Used for the devices with non-volatile memory that require explicit erase (FLASH).
40+
3741
The storage partition is located in the internal non-volatile memory.
3842

3943
Settings load in a separate thread

applications/nrf_desktop/src/modules/Kconfig.caf_settings_loader.default

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ config DESKTOP_SETTINGS_LOADER
1010
bool "Settings loader module (CAF)"
1111
select CAF_SETTINGS_LOADER
1212
select SETTINGS
13-
imply ZMS if SOC_FLASH_NRF_RRAM
14-
imply NVS if !SOC_FLASH_NRF_RRAM
13+
imply ZMS if (SOC_FLASH_NRF_RRAM || SOC_FLASH_NRF_MRAM)
14+
imply NVS if !(SOC_FLASH_NRF_RRAM || SOC_FLASH_NRF_MRAM)
1515
imply FLASH
1616
imply FLASH_MAP
1717
imply FLASH_PAGE_LAYOUT
@@ -23,8 +23,8 @@ config DESKTOP_SETTINGS_LOADER
2323
By default, nRF Desktop application, depending on the non-volatile
2424
memory technology used by the device, uses either the Zephyr Memory
2525
Storage (ZMS) or Non-Volatile Storage (NVS) settings backend.
26-
ZMS is used for the devices with the RRAM non-volatile memory that
27-
do not require explicit erase. Otherwise, the NVS is used.
26+
ZMS is used for the devices with the RRAM or MRAM non-volatile memory
27+
that do not require explicit erase. Otherwise, the NVS is used.
2828

2929
if DESKTOP_SETTINGS_LOADER
3030

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,11 @@ nRF5340 Audio
203203
nRF Desktop
204204
-----------
205205

206-
* Updated the :ref:`zephyr:nrf54h20dk_nrf54h20` release configuration to enable the :ref:`nrf_desktop_watchdog`.
206+
* Updated:
207+
208+
* The :ref:`nrf_desktop_settings_loader` to make the :ref:`Zephyr Memory Storage (ZMS) <zephyr:zms_api>` the default settings backend for all board targets that use the MRAM technology.
209+
As a result, all :ref:`zephyr:nrf54h20dk_nrf54h20` configurations were migrated from the NVS settings backend to the ZMS settings backend.
210+
* The :ref:`zephyr:nrf54h20dk_nrf54h20` release configuration to enable the :ref:`nrf_desktop_watchdog`.
207211

208212
nRF Machine Learning (Edge Impulse)
209213
-----------------------------------

0 commit comments

Comments
 (0)