Skip to content

Commit ced1763

Browse files
mkapala-nordicnordicjm
authored andcommitted
applications: nrf_desktop: Switch to ZMS for RRAM-based devices
Switched to using the Zephyr Memory Storage (ZMS) instead of Non-Volatile Storage (NVS) for all devices that uses the RRAM non-volatile memory (currently only the nRF54L15). Jira: NCSDK-29634 Signed-off-by: Mateusz Kapala <[email protected]>
1 parent d289842 commit ced1763

File tree

1 file changed

+21
-9
lines changed

1 file changed

+21
-9
lines changed

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

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,32 +10,44 @@ config DESKTOP_SETTINGS_LOADER
1010
bool "Settings loader module (CAF)"
1111
select CAF_SETTINGS_LOADER
1212
select SETTINGS
13-
imply NVS
13+
imply ZMS if SOC_FLASH_NRF_RRAM
14+
imply NVS if !SOC_FLASH_NRF_RRAM
1415
imply FLASH
1516
imply FLASH_MAP
1617
imply FLASH_PAGE_LAYOUT
1718
help
1819
nRF Desktop uses settings loader module from Common Application
1920
Framework (CAF).
2021

21-
By default, nRF Desktop application uses non-volatile storage backend
22-
and the settings partition is located in internal FLASH.
22+
The settings partition is located in internal non-volatile memory.
23+
By default, nRF Desktop application, depending on the non-volatile
24+
memory technology used by the device, uses either the Zephyr Memory
25+
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.
2328

2429
if DESKTOP_SETTINGS_LOADER
2530

26-
choice SETTINGS_BACKEND
27-
default SETTINGS_NVS
28-
help
29-
By default, nRF Desktop application uses non-volatile storage
30-
settings backend.
31-
endchoice
31+
if NVS
3232

3333
config NVS_LOG_LEVEL
3434
default 2
3535
help
3636
The nRF Desktop shows only warning and error logs related to the NVS.
3737
This is done to avoid flooding logs.
3838

39+
endif # NVS
40+
41+
if ZMS
42+
43+
config ZMS_LOG_LEVEL
44+
default 2
45+
help
46+
The nRF Desktop shows only warning and error logs related to the ZMS.
47+
This is done to avoid flooding logs.
48+
49+
endif # ZMS
50+
3951
config SETTINGS_DYNAMIC_HANDLERS
4052
default n
4153
help

0 commit comments

Comments
 (0)