From fafc0ec73b741d34878f3141e483a71a491210ec Mon Sep 17 00:00:00 2001 From: Nordic Builder Date: Wed, 19 Feb 2025 12:34:45 +0000 Subject: [PATCH 1/2] manifest: Update sdk-zephyr revision and change some CONFIGs Some of the CONFIGs for ZMS and for its backend for Settings has been added and others deleted. Signed-off-by: Nordic Builder --- .../boards/nrf54l15dk_nrf54l05_cpuapp.conf | 1 + .../boards/nrf54l15dk_nrf54l10_cpuapp.conf | 1 + .../boards/nrf54l15dk_nrf54l15_cpuapp.conf | 1 + .../mesh/chat/boards/nrf54l15dk_nrf54l05_cpuapp.conf | 1 + .../mesh/chat/boards/nrf54l15dk_nrf54l10_cpuapp.conf | 1 + .../mesh/chat/boards/nrf54l15dk_nrf54l15_cpuapp.conf | 1 + .../dfu/distributor/boards/nrf54l15dk_nrf54l10_cpuapp.conf | 1 + .../dfu/distributor/boards/nrf54l15dk_nrf54l15_cpuapp.conf | 1 + .../mesh/dfu/target/boards/nrf54l15dk_nrf54l10_cpuapp.conf | 1 + .../mesh/dfu/target/boards/nrf54l15dk_nrf54l15_cpuapp.conf | 1 + .../mesh/light/boards/nrf54l15dk_nrf54l05_cpuapp.conf | 1 + .../mesh/light/boards/nrf54l15dk_nrf54l10_cpuapp.conf | 1 + .../mesh/light/boards/nrf54l15dk_nrf54l15_cpuapp.conf | 1 + .../mesh/light_ctrl/boards/nrf54l15dk_nrf54l05_cpuapp.conf | 1 + .../mesh/light_ctrl/boards/nrf54l15dk_nrf54l10_cpuapp.conf | 1 + .../mesh/light_ctrl/boards/nrf54l15dk_nrf54l15_cpuapp.conf | 1 + .../light_dimmer/boards/nrf54l15dk_nrf54l05_cpuapp.conf | 1 + .../light_dimmer/boards/nrf54l15dk_nrf54l10_cpuapp.conf | 1 + .../light_dimmer/boards/nrf54l15dk_nrf54l15_cpuapp.conf | 1 + .../light_switch/boards/nrf54l15dk_nrf54l05_cpuapp.conf | 1 + .../light_switch/boards/nrf54l15dk_nrf54l10_cpuapp.conf | 1 + .../light_switch/boards/nrf54l15dk_nrf54l15_cpuapp.conf | 1 + .../sensor_client/boards/nrf54l15dk_nrf54l05_cpuapp.conf | 1 + .../sensor_client/boards/nrf54l15dk_nrf54l10_cpuapp.conf | 1 + .../sensor_client/boards/nrf54l15dk_nrf54l15_cpuapp.conf | 1 + .../sensor_server/boards/nrf54l15dk_nrf54l05_cpuapp.conf | 1 + .../sensor_server/boards/nrf54l15dk_nrf54l10_cpuapp.conf | 1 + .../sensor_server/boards/nrf54l15dk_nrf54l15_cpuapp.conf | 1 + .../silvair_enocean/boards/nrf54l15dk_nrf54l05_cpuapp.conf | 1 + .../silvair_enocean/boards/nrf54l15dk_nrf54l10_cpuapp.conf | 1 + .../silvair_enocean/boards/nrf54l15dk_nrf54l15_cpuapp.conf | 1 + .../light_bulb/boards/nrf54l15dk_nrf54l15_cpuapp.conf | 6 ++++-- .../light_bulb/boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf | 7 +++++-- .../light_switch/boards/nrf54l15dk_nrf54l15_cpuapp.conf | 2 -- .../light_switch/boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf | 2 -- samples/matter/lock/boards/nrf54l15dk_nrf54l15_cpuapp.conf | 7 +++++-- .../matter/lock/boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf | 7 +++++-- .../smoke_co_alarm/boards/nrf54l15dk_nrf54l10_cpuapp.conf | 2 -- .../smoke_co_alarm/boards/nrf54l15dk_nrf54l15_cpuapp.conf | 2 -- .../matter/template/boards/nrf54l15dk_nrf54l10_cpuapp.conf | 3 --- .../matter/template/boards/nrf54l15dk_nrf54l15_cpuapp.conf | 3 --- .../boards/nrf54l15dk_nrf54l15_cpuapp_internal.conf | 2 -- .../template/boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf | 2 -- .../thermostat/boards/nrf54l15dk_nrf54l15_cpuapp.conf | 3 --- .../thermostat/boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf | 2 -- .../window_covering/boards/nrf54l15dk_nrf54l15_cpuapp.conf | 2 -- .../boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf | 2 -- .../openthread/cli/boards/nrf54l15dk_nrf54l15_cpuapp.conf | 5 +++++ .../coprocessor/boards/nrf54l15dk_nrf54l15_cpuapp.conf | 5 +++++ west.yml | 2 +- 50 files changed, 61 insertions(+), 36 deletions(-) diff --git a/samples/bluetooth/mesh/ble_peripheral_lbs_coex/boards/nrf54l15dk_nrf54l05_cpuapp.conf b/samples/bluetooth/mesh/ble_peripheral_lbs_coex/boards/nrf54l15dk_nrf54l05_cpuapp.conf index 13b39eeabfb5..7bfe89180e3e 100644 --- a/samples/bluetooth/mesh/ble_peripheral_lbs_coex/boards/nrf54l15dk_nrf54l05_cpuapp.conf +++ b/samples/bluetooth/mesh/ble_peripheral_lbs_coex/boards/nrf54l15dk_nrf54l05_cpuapp.conf @@ -11,6 +11,7 @@ CONFIG_NVS=n CONFIG_NVS_LOOKUP_CACHE=n CONFIG_SETTINGS_NVS_NAME_CACHE=n CONFIG_ZMS=y +CONFIG_SETTINGS_ZMS_CUSTOM_SECTOR_COUNT=y CONFIG_SETTINGS_ZMS_SECTOR_COUNT=8 CONFIG_ZMS_LOOKUP_CACHE=y CONFIG_ZMS_LOOKUP_CACHE_SIZE=512 diff --git a/samples/bluetooth/mesh/ble_peripheral_lbs_coex/boards/nrf54l15dk_nrf54l10_cpuapp.conf b/samples/bluetooth/mesh/ble_peripheral_lbs_coex/boards/nrf54l15dk_nrf54l10_cpuapp.conf index 55120e85651f..6a68cf0dfe51 100644 --- a/samples/bluetooth/mesh/ble_peripheral_lbs_coex/boards/nrf54l15dk_nrf54l10_cpuapp.conf +++ b/samples/bluetooth/mesh/ble_peripheral_lbs_coex/boards/nrf54l15dk_nrf54l10_cpuapp.conf @@ -11,6 +11,7 @@ CONFIG_NVS=n CONFIG_NVS_LOOKUP_CACHE=n CONFIG_SETTINGS_NVS_NAME_CACHE=n CONFIG_ZMS=y +CONFIG_SETTINGS_ZMS_CUSTOM_SECTOR_COUNT=y CONFIG_SETTINGS_ZMS_SECTOR_COUNT=8 CONFIG_ZMS_LOOKUP_CACHE=y CONFIG_ZMS_LOOKUP_CACHE_SIZE=512 diff --git a/samples/bluetooth/mesh/ble_peripheral_lbs_coex/boards/nrf54l15dk_nrf54l15_cpuapp.conf b/samples/bluetooth/mesh/ble_peripheral_lbs_coex/boards/nrf54l15dk_nrf54l15_cpuapp.conf index 995706b02555..648917138823 100644 --- a/samples/bluetooth/mesh/ble_peripheral_lbs_coex/boards/nrf54l15dk_nrf54l15_cpuapp.conf +++ b/samples/bluetooth/mesh/ble_peripheral_lbs_coex/boards/nrf54l15dk_nrf54l15_cpuapp.conf @@ -11,6 +11,7 @@ CONFIG_NVS=n CONFIG_NVS_LOOKUP_CACHE=n CONFIG_SETTINGS_NVS_NAME_CACHE=n CONFIG_ZMS=y +CONFIG_SETTINGS_ZMS_CUSTOM_SECTOR_COUNT=y CONFIG_SETTINGS_ZMS_SECTOR_COUNT=8 CONFIG_ZMS_LOOKUP_CACHE=y CONFIG_ZMS_LOOKUP_CACHE_SIZE=512 diff --git a/samples/bluetooth/mesh/chat/boards/nrf54l15dk_nrf54l05_cpuapp.conf b/samples/bluetooth/mesh/chat/boards/nrf54l15dk_nrf54l05_cpuapp.conf index 13b39eeabfb5..7bfe89180e3e 100644 --- a/samples/bluetooth/mesh/chat/boards/nrf54l15dk_nrf54l05_cpuapp.conf +++ b/samples/bluetooth/mesh/chat/boards/nrf54l15dk_nrf54l05_cpuapp.conf @@ -11,6 +11,7 @@ CONFIG_NVS=n CONFIG_NVS_LOOKUP_CACHE=n CONFIG_SETTINGS_NVS_NAME_CACHE=n CONFIG_ZMS=y +CONFIG_SETTINGS_ZMS_CUSTOM_SECTOR_COUNT=y CONFIG_SETTINGS_ZMS_SECTOR_COUNT=8 CONFIG_ZMS_LOOKUP_CACHE=y CONFIG_ZMS_LOOKUP_CACHE_SIZE=512 diff --git a/samples/bluetooth/mesh/chat/boards/nrf54l15dk_nrf54l10_cpuapp.conf b/samples/bluetooth/mesh/chat/boards/nrf54l15dk_nrf54l10_cpuapp.conf index 55120e85651f..6a68cf0dfe51 100644 --- a/samples/bluetooth/mesh/chat/boards/nrf54l15dk_nrf54l10_cpuapp.conf +++ b/samples/bluetooth/mesh/chat/boards/nrf54l15dk_nrf54l10_cpuapp.conf @@ -11,6 +11,7 @@ CONFIG_NVS=n CONFIG_NVS_LOOKUP_CACHE=n CONFIG_SETTINGS_NVS_NAME_CACHE=n CONFIG_ZMS=y +CONFIG_SETTINGS_ZMS_CUSTOM_SECTOR_COUNT=y CONFIG_SETTINGS_ZMS_SECTOR_COUNT=8 CONFIG_ZMS_LOOKUP_CACHE=y CONFIG_ZMS_LOOKUP_CACHE_SIZE=512 diff --git a/samples/bluetooth/mesh/chat/boards/nrf54l15dk_nrf54l15_cpuapp.conf b/samples/bluetooth/mesh/chat/boards/nrf54l15dk_nrf54l15_cpuapp.conf index 995706b02555..648917138823 100644 --- a/samples/bluetooth/mesh/chat/boards/nrf54l15dk_nrf54l15_cpuapp.conf +++ b/samples/bluetooth/mesh/chat/boards/nrf54l15dk_nrf54l15_cpuapp.conf @@ -11,6 +11,7 @@ CONFIG_NVS=n CONFIG_NVS_LOOKUP_CACHE=n CONFIG_SETTINGS_NVS_NAME_CACHE=n CONFIG_ZMS=y +CONFIG_SETTINGS_ZMS_CUSTOM_SECTOR_COUNT=y CONFIG_SETTINGS_ZMS_SECTOR_COUNT=8 CONFIG_ZMS_LOOKUP_CACHE=y CONFIG_ZMS_LOOKUP_CACHE_SIZE=512 diff --git a/samples/bluetooth/mesh/dfu/distributor/boards/nrf54l15dk_nrf54l10_cpuapp.conf b/samples/bluetooth/mesh/dfu/distributor/boards/nrf54l15dk_nrf54l10_cpuapp.conf index 55120e85651f..6a68cf0dfe51 100644 --- a/samples/bluetooth/mesh/dfu/distributor/boards/nrf54l15dk_nrf54l10_cpuapp.conf +++ b/samples/bluetooth/mesh/dfu/distributor/boards/nrf54l15dk_nrf54l10_cpuapp.conf @@ -11,6 +11,7 @@ CONFIG_NVS=n CONFIG_NVS_LOOKUP_CACHE=n CONFIG_SETTINGS_NVS_NAME_CACHE=n CONFIG_ZMS=y +CONFIG_SETTINGS_ZMS_CUSTOM_SECTOR_COUNT=y CONFIG_SETTINGS_ZMS_SECTOR_COUNT=8 CONFIG_ZMS_LOOKUP_CACHE=y CONFIG_ZMS_LOOKUP_CACHE_SIZE=512 diff --git a/samples/bluetooth/mesh/dfu/distributor/boards/nrf54l15dk_nrf54l15_cpuapp.conf b/samples/bluetooth/mesh/dfu/distributor/boards/nrf54l15dk_nrf54l15_cpuapp.conf index 995706b02555..648917138823 100644 --- a/samples/bluetooth/mesh/dfu/distributor/boards/nrf54l15dk_nrf54l15_cpuapp.conf +++ b/samples/bluetooth/mesh/dfu/distributor/boards/nrf54l15dk_nrf54l15_cpuapp.conf @@ -11,6 +11,7 @@ CONFIG_NVS=n CONFIG_NVS_LOOKUP_CACHE=n CONFIG_SETTINGS_NVS_NAME_CACHE=n CONFIG_ZMS=y +CONFIG_SETTINGS_ZMS_CUSTOM_SECTOR_COUNT=y CONFIG_SETTINGS_ZMS_SECTOR_COUNT=8 CONFIG_ZMS_LOOKUP_CACHE=y CONFIG_ZMS_LOOKUP_CACHE_SIZE=512 diff --git a/samples/bluetooth/mesh/dfu/target/boards/nrf54l15dk_nrf54l10_cpuapp.conf b/samples/bluetooth/mesh/dfu/target/boards/nrf54l15dk_nrf54l10_cpuapp.conf index 55120e85651f..6a68cf0dfe51 100644 --- a/samples/bluetooth/mesh/dfu/target/boards/nrf54l15dk_nrf54l10_cpuapp.conf +++ b/samples/bluetooth/mesh/dfu/target/boards/nrf54l15dk_nrf54l10_cpuapp.conf @@ -11,6 +11,7 @@ CONFIG_NVS=n CONFIG_NVS_LOOKUP_CACHE=n CONFIG_SETTINGS_NVS_NAME_CACHE=n CONFIG_ZMS=y +CONFIG_SETTINGS_ZMS_CUSTOM_SECTOR_COUNT=y CONFIG_SETTINGS_ZMS_SECTOR_COUNT=8 CONFIG_ZMS_LOOKUP_CACHE=y CONFIG_ZMS_LOOKUP_CACHE_SIZE=512 diff --git a/samples/bluetooth/mesh/dfu/target/boards/nrf54l15dk_nrf54l15_cpuapp.conf b/samples/bluetooth/mesh/dfu/target/boards/nrf54l15dk_nrf54l15_cpuapp.conf index 995706b02555..648917138823 100644 --- a/samples/bluetooth/mesh/dfu/target/boards/nrf54l15dk_nrf54l15_cpuapp.conf +++ b/samples/bluetooth/mesh/dfu/target/boards/nrf54l15dk_nrf54l15_cpuapp.conf @@ -11,6 +11,7 @@ CONFIG_NVS=n CONFIG_NVS_LOOKUP_CACHE=n CONFIG_SETTINGS_NVS_NAME_CACHE=n CONFIG_ZMS=y +CONFIG_SETTINGS_ZMS_CUSTOM_SECTOR_COUNT=y CONFIG_SETTINGS_ZMS_SECTOR_COUNT=8 CONFIG_ZMS_LOOKUP_CACHE=y CONFIG_ZMS_LOOKUP_CACHE_SIZE=512 diff --git a/samples/bluetooth/mesh/light/boards/nrf54l15dk_nrf54l05_cpuapp.conf b/samples/bluetooth/mesh/light/boards/nrf54l15dk_nrf54l05_cpuapp.conf index b6b4e45f2f70..6c3dd4e2b8e8 100644 --- a/samples/bluetooth/mesh/light/boards/nrf54l15dk_nrf54l05_cpuapp.conf +++ b/samples/bluetooth/mesh/light/boards/nrf54l15dk_nrf54l05_cpuapp.conf @@ -12,6 +12,7 @@ CONFIG_NVS=n CONFIG_NVS_LOOKUP_CACHE=n CONFIG_SETTINGS_NVS_NAME_CACHE=n CONFIG_ZMS=y +CONFIG_SETTINGS_ZMS_CUSTOM_SECTOR_COUNT=y CONFIG_SETTINGS_ZMS_SECTOR_COUNT=8 CONFIG_ZMS_LOOKUP_CACHE=y CONFIG_ZMS_LOOKUP_CACHE_SIZE=512 diff --git a/samples/bluetooth/mesh/light/boards/nrf54l15dk_nrf54l10_cpuapp.conf b/samples/bluetooth/mesh/light/boards/nrf54l15dk_nrf54l10_cpuapp.conf index 153a16959be6..f757e7f4e70c 100644 --- a/samples/bluetooth/mesh/light/boards/nrf54l15dk_nrf54l10_cpuapp.conf +++ b/samples/bluetooth/mesh/light/boards/nrf54l15dk_nrf54l10_cpuapp.conf @@ -12,6 +12,7 @@ CONFIG_NVS=n CONFIG_NVS_LOOKUP_CACHE=n CONFIG_SETTINGS_NVS_NAME_CACHE=n CONFIG_ZMS=y +CONFIG_SETTINGS_ZMS_CUSTOM_SECTOR_COUNT=y CONFIG_SETTINGS_ZMS_SECTOR_COUNT=8 CONFIG_ZMS_LOOKUP_CACHE=y CONFIG_ZMS_LOOKUP_CACHE_SIZE=512 diff --git a/samples/bluetooth/mesh/light/boards/nrf54l15dk_nrf54l15_cpuapp.conf b/samples/bluetooth/mesh/light/boards/nrf54l15dk_nrf54l15_cpuapp.conf index 6412354a7c26..fd98d2151975 100644 --- a/samples/bluetooth/mesh/light/boards/nrf54l15dk_nrf54l15_cpuapp.conf +++ b/samples/bluetooth/mesh/light/boards/nrf54l15dk_nrf54l15_cpuapp.conf @@ -12,6 +12,7 @@ CONFIG_NVS=n CONFIG_NVS_LOOKUP_CACHE=n CONFIG_SETTINGS_NVS_NAME_CACHE=n CONFIG_ZMS=y +CONFIG_SETTINGS_ZMS_CUSTOM_SECTOR_COUNT=y CONFIG_SETTINGS_ZMS_SECTOR_COUNT=8 CONFIG_ZMS_LOOKUP_CACHE=y CONFIG_ZMS_LOOKUP_CACHE_SIZE=512 diff --git a/samples/bluetooth/mesh/light_ctrl/boards/nrf54l15dk_nrf54l05_cpuapp.conf b/samples/bluetooth/mesh/light_ctrl/boards/nrf54l15dk_nrf54l05_cpuapp.conf index 13b39eeabfb5..7bfe89180e3e 100644 --- a/samples/bluetooth/mesh/light_ctrl/boards/nrf54l15dk_nrf54l05_cpuapp.conf +++ b/samples/bluetooth/mesh/light_ctrl/boards/nrf54l15dk_nrf54l05_cpuapp.conf @@ -11,6 +11,7 @@ CONFIG_NVS=n CONFIG_NVS_LOOKUP_CACHE=n CONFIG_SETTINGS_NVS_NAME_CACHE=n CONFIG_ZMS=y +CONFIG_SETTINGS_ZMS_CUSTOM_SECTOR_COUNT=y CONFIG_SETTINGS_ZMS_SECTOR_COUNT=8 CONFIG_ZMS_LOOKUP_CACHE=y CONFIG_ZMS_LOOKUP_CACHE_SIZE=512 diff --git a/samples/bluetooth/mesh/light_ctrl/boards/nrf54l15dk_nrf54l10_cpuapp.conf b/samples/bluetooth/mesh/light_ctrl/boards/nrf54l15dk_nrf54l10_cpuapp.conf index 55120e85651f..6a68cf0dfe51 100644 --- a/samples/bluetooth/mesh/light_ctrl/boards/nrf54l15dk_nrf54l10_cpuapp.conf +++ b/samples/bluetooth/mesh/light_ctrl/boards/nrf54l15dk_nrf54l10_cpuapp.conf @@ -11,6 +11,7 @@ CONFIG_NVS=n CONFIG_NVS_LOOKUP_CACHE=n CONFIG_SETTINGS_NVS_NAME_CACHE=n CONFIG_ZMS=y +CONFIG_SETTINGS_ZMS_CUSTOM_SECTOR_COUNT=y CONFIG_SETTINGS_ZMS_SECTOR_COUNT=8 CONFIG_ZMS_LOOKUP_CACHE=y CONFIG_ZMS_LOOKUP_CACHE_SIZE=512 diff --git a/samples/bluetooth/mesh/light_ctrl/boards/nrf54l15dk_nrf54l15_cpuapp.conf b/samples/bluetooth/mesh/light_ctrl/boards/nrf54l15dk_nrf54l15_cpuapp.conf index 995706b02555..648917138823 100644 --- a/samples/bluetooth/mesh/light_ctrl/boards/nrf54l15dk_nrf54l15_cpuapp.conf +++ b/samples/bluetooth/mesh/light_ctrl/boards/nrf54l15dk_nrf54l15_cpuapp.conf @@ -11,6 +11,7 @@ CONFIG_NVS=n CONFIG_NVS_LOOKUP_CACHE=n CONFIG_SETTINGS_NVS_NAME_CACHE=n CONFIG_ZMS=y +CONFIG_SETTINGS_ZMS_CUSTOM_SECTOR_COUNT=y CONFIG_SETTINGS_ZMS_SECTOR_COUNT=8 CONFIG_ZMS_LOOKUP_CACHE=y CONFIG_ZMS_LOOKUP_CACHE_SIZE=512 diff --git a/samples/bluetooth/mesh/light_dimmer/boards/nrf54l15dk_nrf54l05_cpuapp.conf b/samples/bluetooth/mesh/light_dimmer/boards/nrf54l15dk_nrf54l05_cpuapp.conf index 13b39eeabfb5..7bfe89180e3e 100644 --- a/samples/bluetooth/mesh/light_dimmer/boards/nrf54l15dk_nrf54l05_cpuapp.conf +++ b/samples/bluetooth/mesh/light_dimmer/boards/nrf54l15dk_nrf54l05_cpuapp.conf @@ -11,6 +11,7 @@ CONFIG_NVS=n CONFIG_NVS_LOOKUP_CACHE=n CONFIG_SETTINGS_NVS_NAME_CACHE=n CONFIG_ZMS=y +CONFIG_SETTINGS_ZMS_CUSTOM_SECTOR_COUNT=y CONFIG_SETTINGS_ZMS_SECTOR_COUNT=8 CONFIG_ZMS_LOOKUP_CACHE=y CONFIG_ZMS_LOOKUP_CACHE_SIZE=512 diff --git a/samples/bluetooth/mesh/light_dimmer/boards/nrf54l15dk_nrf54l10_cpuapp.conf b/samples/bluetooth/mesh/light_dimmer/boards/nrf54l15dk_nrf54l10_cpuapp.conf index 55120e85651f..6a68cf0dfe51 100644 --- a/samples/bluetooth/mesh/light_dimmer/boards/nrf54l15dk_nrf54l10_cpuapp.conf +++ b/samples/bluetooth/mesh/light_dimmer/boards/nrf54l15dk_nrf54l10_cpuapp.conf @@ -11,6 +11,7 @@ CONFIG_NVS=n CONFIG_NVS_LOOKUP_CACHE=n CONFIG_SETTINGS_NVS_NAME_CACHE=n CONFIG_ZMS=y +CONFIG_SETTINGS_ZMS_CUSTOM_SECTOR_COUNT=y CONFIG_SETTINGS_ZMS_SECTOR_COUNT=8 CONFIG_ZMS_LOOKUP_CACHE=y CONFIG_ZMS_LOOKUP_CACHE_SIZE=512 diff --git a/samples/bluetooth/mesh/light_dimmer/boards/nrf54l15dk_nrf54l15_cpuapp.conf b/samples/bluetooth/mesh/light_dimmer/boards/nrf54l15dk_nrf54l15_cpuapp.conf index 995706b02555..648917138823 100644 --- a/samples/bluetooth/mesh/light_dimmer/boards/nrf54l15dk_nrf54l15_cpuapp.conf +++ b/samples/bluetooth/mesh/light_dimmer/boards/nrf54l15dk_nrf54l15_cpuapp.conf @@ -11,6 +11,7 @@ CONFIG_NVS=n CONFIG_NVS_LOOKUP_CACHE=n CONFIG_SETTINGS_NVS_NAME_CACHE=n CONFIG_ZMS=y +CONFIG_SETTINGS_ZMS_CUSTOM_SECTOR_COUNT=y CONFIG_SETTINGS_ZMS_SECTOR_COUNT=8 CONFIG_ZMS_LOOKUP_CACHE=y CONFIG_ZMS_LOOKUP_CACHE_SIZE=512 diff --git a/samples/bluetooth/mesh/light_switch/boards/nrf54l15dk_nrf54l05_cpuapp.conf b/samples/bluetooth/mesh/light_switch/boards/nrf54l15dk_nrf54l05_cpuapp.conf index 13b39eeabfb5..7bfe89180e3e 100644 --- a/samples/bluetooth/mesh/light_switch/boards/nrf54l15dk_nrf54l05_cpuapp.conf +++ b/samples/bluetooth/mesh/light_switch/boards/nrf54l15dk_nrf54l05_cpuapp.conf @@ -11,6 +11,7 @@ CONFIG_NVS=n CONFIG_NVS_LOOKUP_CACHE=n CONFIG_SETTINGS_NVS_NAME_CACHE=n CONFIG_ZMS=y +CONFIG_SETTINGS_ZMS_CUSTOM_SECTOR_COUNT=y CONFIG_SETTINGS_ZMS_SECTOR_COUNT=8 CONFIG_ZMS_LOOKUP_CACHE=y CONFIG_ZMS_LOOKUP_CACHE_SIZE=512 diff --git a/samples/bluetooth/mesh/light_switch/boards/nrf54l15dk_nrf54l10_cpuapp.conf b/samples/bluetooth/mesh/light_switch/boards/nrf54l15dk_nrf54l10_cpuapp.conf index 55120e85651f..6a68cf0dfe51 100644 --- a/samples/bluetooth/mesh/light_switch/boards/nrf54l15dk_nrf54l10_cpuapp.conf +++ b/samples/bluetooth/mesh/light_switch/boards/nrf54l15dk_nrf54l10_cpuapp.conf @@ -11,6 +11,7 @@ CONFIG_NVS=n CONFIG_NVS_LOOKUP_CACHE=n CONFIG_SETTINGS_NVS_NAME_CACHE=n CONFIG_ZMS=y +CONFIG_SETTINGS_ZMS_CUSTOM_SECTOR_COUNT=y CONFIG_SETTINGS_ZMS_SECTOR_COUNT=8 CONFIG_ZMS_LOOKUP_CACHE=y CONFIG_ZMS_LOOKUP_CACHE_SIZE=512 diff --git a/samples/bluetooth/mesh/light_switch/boards/nrf54l15dk_nrf54l15_cpuapp.conf b/samples/bluetooth/mesh/light_switch/boards/nrf54l15dk_nrf54l15_cpuapp.conf index 995706b02555..648917138823 100644 --- a/samples/bluetooth/mesh/light_switch/boards/nrf54l15dk_nrf54l15_cpuapp.conf +++ b/samples/bluetooth/mesh/light_switch/boards/nrf54l15dk_nrf54l15_cpuapp.conf @@ -11,6 +11,7 @@ CONFIG_NVS=n CONFIG_NVS_LOOKUP_CACHE=n CONFIG_SETTINGS_NVS_NAME_CACHE=n CONFIG_ZMS=y +CONFIG_SETTINGS_ZMS_CUSTOM_SECTOR_COUNT=y CONFIG_SETTINGS_ZMS_SECTOR_COUNT=8 CONFIG_ZMS_LOOKUP_CACHE=y CONFIG_ZMS_LOOKUP_CACHE_SIZE=512 diff --git a/samples/bluetooth/mesh/sensor_client/boards/nrf54l15dk_nrf54l05_cpuapp.conf b/samples/bluetooth/mesh/sensor_client/boards/nrf54l15dk_nrf54l05_cpuapp.conf index 13b39eeabfb5..7bfe89180e3e 100644 --- a/samples/bluetooth/mesh/sensor_client/boards/nrf54l15dk_nrf54l05_cpuapp.conf +++ b/samples/bluetooth/mesh/sensor_client/boards/nrf54l15dk_nrf54l05_cpuapp.conf @@ -11,6 +11,7 @@ CONFIG_NVS=n CONFIG_NVS_LOOKUP_CACHE=n CONFIG_SETTINGS_NVS_NAME_CACHE=n CONFIG_ZMS=y +CONFIG_SETTINGS_ZMS_CUSTOM_SECTOR_COUNT=y CONFIG_SETTINGS_ZMS_SECTOR_COUNT=8 CONFIG_ZMS_LOOKUP_CACHE=y CONFIG_ZMS_LOOKUP_CACHE_SIZE=512 diff --git a/samples/bluetooth/mesh/sensor_client/boards/nrf54l15dk_nrf54l10_cpuapp.conf b/samples/bluetooth/mesh/sensor_client/boards/nrf54l15dk_nrf54l10_cpuapp.conf index 55120e85651f..6a68cf0dfe51 100644 --- a/samples/bluetooth/mesh/sensor_client/boards/nrf54l15dk_nrf54l10_cpuapp.conf +++ b/samples/bluetooth/mesh/sensor_client/boards/nrf54l15dk_nrf54l10_cpuapp.conf @@ -11,6 +11,7 @@ CONFIG_NVS=n CONFIG_NVS_LOOKUP_CACHE=n CONFIG_SETTINGS_NVS_NAME_CACHE=n CONFIG_ZMS=y +CONFIG_SETTINGS_ZMS_CUSTOM_SECTOR_COUNT=y CONFIG_SETTINGS_ZMS_SECTOR_COUNT=8 CONFIG_ZMS_LOOKUP_CACHE=y CONFIG_ZMS_LOOKUP_CACHE_SIZE=512 diff --git a/samples/bluetooth/mesh/sensor_client/boards/nrf54l15dk_nrf54l15_cpuapp.conf b/samples/bluetooth/mesh/sensor_client/boards/nrf54l15dk_nrf54l15_cpuapp.conf index 995706b02555..648917138823 100644 --- a/samples/bluetooth/mesh/sensor_client/boards/nrf54l15dk_nrf54l15_cpuapp.conf +++ b/samples/bluetooth/mesh/sensor_client/boards/nrf54l15dk_nrf54l15_cpuapp.conf @@ -11,6 +11,7 @@ CONFIG_NVS=n CONFIG_NVS_LOOKUP_CACHE=n CONFIG_SETTINGS_NVS_NAME_CACHE=n CONFIG_ZMS=y +CONFIG_SETTINGS_ZMS_CUSTOM_SECTOR_COUNT=y CONFIG_SETTINGS_ZMS_SECTOR_COUNT=8 CONFIG_ZMS_LOOKUP_CACHE=y CONFIG_ZMS_LOOKUP_CACHE_SIZE=512 diff --git a/samples/bluetooth/mesh/sensor_server/boards/nrf54l15dk_nrf54l05_cpuapp.conf b/samples/bluetooth/mesh/sensor_server/boards/nrf54l15dk_nrf54l05_cpuapp.conf index 13b39eeabfb5..7bfe89180e3e 100644 --- a/samples/bluetooth/mesh/sensor_server/boards/nrf54l15dk_nrf54l05_cpuapp.conf +++ b/samples/bluetooth/mesh/sensor_server/boards/nrf54l15dk_nrf54l05_cpuapp.conf @@ -11,6 +11,7 @@ CONFIG_NVS=n CONFIG_NVS_LOOKUP_CACHE=n CONFIG_SETTINGS_NVS_NAME_CACHE=n CONFIG_ZMS=y +CONFIG_SETTINGS_ZMS_CUSTOM_SECTOR_COUNT=y CONFIG_SETTINGS_ZMS_SECTOR_COUNT=8 CONFIG_ZMS_LOOKUP_CACHE=y CONFIG_ZMS_LOOKUP_CACHE_SIZE=512 diff --git a/samples/bluetooth/mesh/sensor_server/boards/nrf54l15dk_nrf54l10_cpuapp.conf b/samples/bluetooth/mesh/sensor_server/boards/nrf54l15dk_nrf54l10_cpuapp.conf index 55120e85651f..6a68cf0dfe51 100644 --- a/samples/bluetooth/mesh/sensor_server/boards/nrf54l15dk_nrf54l10_cpuapp.conf +++ b/samples/bluetooth/mesh/sensor_server/boards/nrf54l15dk_nrf54l10_cpuapp.conf @@ -11,6 +11,7 @@ CONFIG_NVS=n CONFIG_NVS_LOOKUP_CACHE=n CONFIG_SETTINGS_NVS_NAME_CACHE=n CONFIG_ZMS=y +CONFIG_SETTINGS_ZMS_CUSTOM_SECTOR_COUNT=y CONFIG_SETTINGS_ZMS_SECTOR_COUNT=8 CONFIG_ZMS_LOOKUP_CACHE=y CONFIG_ZMS_LOOKUP_CACHE_SIZE=512 diff --git a/samples/bluetooth/mesh/sensor_server/boards/nrf54l15dk_nrf54l15_cpuapp.conf b/samples/bluetooth/mesh/sensor_server/boards/nrf54l15dk_nrf54l15_cpuapp.conf index 995706b02555..648917138823 100644 --- a/samples/bluetooth/mesh/sensor_server/boards/nrf54l15dk_nrf54l15_cpuapp.conf +++ b/samples/bluetooth/mesh/sensor_server/boards/nrf54l15dk_nrf54l15_cpuapp.conf @@ -11,6 +11,7 @@ CONFIG_NVS=n CONFIG_NVS_LOOKUP_CACHE=n CONFIG_SETTINGS_NVS_NAME_CACHE=n CONFIG_ZMS=y +CONFIG_SETTINGS_ZMS_CUSTOM_SECTOR_COUNT=y CONFIG_SETTINGS_ZMS_SECTOR_COUNT=8 CONFIG_ZMS_LOOKUP_CACHE=y CONFIG_ZMS_LOOKUP_CACHE_SIZE=512 diff --git a/samples/bluetooth/mesh/silvair_enocean/boards/nrf54l15dk_nrf54l05_cpuapp.conf b/samples/bluetooth/mesh/silvair_enocean/boards/nrf54l15dk_nrf54l05_cpuapp.conf index 13b39eeabfb5..7bfe89180e3e 100644 --- a/samples/bluetooth/mesh/silvair_enocean/boards/nrf54l15dk_nrf54l05_cpuapp.conf +++ b/samples/bluetooth/mesh/silvair_enocean/boards/nrf54l15dk_nrf54l05_cpuapp.conf @@ -11,6 +11,7 @@ CONFIG_NVS=n CONFIG_NVS_LOOKUP_CACHE=n CONFIG_SETTINGS_NVS_NAME_CACHE=n CONFIG_ZMS=y +CONFIG_SETTINGS_ZMS_CUSTOM_SECTOR_COUNT=y CONFIG_SETTINGS_ZMS_SECTOR_COUNT=8 CONFIG_ZMS_LOOKUP_CACHE=y CONFIG_ZMS_LOOKUP_CACHE_SIZE=512 diff --git a/samples/bluetooth/mesh/silvair_enocean/boards/nrf54l15dk_nrf54l10_cpuapp.conf b/samples/bluetooth/mesh/silvair_enocean/boards/nrf54l15dk_nrf54l10_cpuapp.conf index 55120e85651f..6a68cf0dfe51 100644 --- a/samples/bluetooth/mesh/silvair_enocean/boards/nrf54l15dk_nrf54l10_cpuapp.conf +++ b/samples/bluetooth/mesh/silvair_enocean/boards/nrf54l15dk_nrf54l10_cpuapp.conf @@ -11,6 +11,7 @@ CONFIG_NVS=n CONFIG_NVS_LOOKUP_CACHE=n CONFIG_SETTINGS_NVS_NAME_CACHE=n CONFIG_ZMS=y +CONFIG_SETTINGS_ZMS_CUSTOM_SECTOR_COUNT=y CONFIG_SETTINGS_ZMS_SECTOR_COUNT=8 CONFIG_ZMS_LOOKUP_CACHE=y CONFIG_ZMS_LOOKUP_CACHE_SIZE=512 diff --git a/samples/bluetooth/mesh/silvair_enocean/boards/nrf54l15dk_nrf54l15_cpuapp.conf b/samples/bluetooth/mesh/silvair_enocean/boards/nrf54l15dk_nrf54l15_cpuapp.conf index 995706b02555..648917138823 100644 --- a/samples/bluetooth/mesh/silvair_enocean/boards/nrf54l15dk_nrf54l15_cpuapp.conf +++ b/samples/bluetooth/mesh/silvair_enocean/boards/nrf54l15dk_nrf54l15_cpuapp.conf @@ -11,6 +11,7 @@ CONFIG_NVS=n CONFIG_NVS_LOOKUP_CACHE=n CONFIG_SETTINGS_NVS_NAME_CACHE=n CONFIG_ZMS=y +CONFIG_SETTINGS_ZMS_CUSTOM_SECTOR_COUNT=y CONFIG_SETTINGS_ZMS_SECTOR_COUNT=8 CONFIG_ZMS_LOOKUP_CACHE=y CONFIG_ZMS_LOOKUP_CACHE_SIZE=512 diff --git a/samples/matter/light_bulb/boards/nrf54l15dk_nrf54l15_cpuapp.conf b/samples/matter/light_bulb/boards/nrf54l15dk_nrf54l15_cpuapp.conf index 56ffa14520e2..152a7c132a77 100644 --- a/samples/matter/light_bulb/boards/nrf54l15dk_nrf54l15_cpuapp.conf +++ b/samples/matter/light_bulb/boards/nrf54l15dk_nrf54l15_cpuapp.conf @@ -7,8 +7,10 @@ # Multirole is the only currently supported role by SoftDevice. CONFIG_BT_LL_SOFTDEVICE_MULTIROLE=y -# Set the ZMS sector count to match the settings partition size that is 40 kB for this application. -CONFIG_SETTINGS_ZMS_SECTOR_COUNT=10 +CONFIG_SETTINGS_ZMS_NAME_CACHE=y +CONFIG_SETTINGS_ZMS_NAME_CACHE_SIZE=512 +CONFIG_ZMS_LOOKUP_CACHE_FOR_SETTINGS=y +CONFIG_SETTINGS_ZMS_NO_LL_DELETE=y # 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. diff --git a/samples/matter/light_bulb/boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf b/samples/matter/light_bulb/boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf index 48281dc5eea4..430d3b7be7cc 100644 --- a/samples/matter/light_bulb/boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf +++ b/samples/matter/light_bulb/boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf @@ -13,8 +13,11 @@ CONFIG_CHIP_FACTORY_DATA_WRITE_PROTECT=n # TODO: KRKNWK-19382: Disable NFC commissioning due to an issue with definitions for ns build. CONFIG_CHIP_NFC_COMMISSIONING=n -# Set the ZMS sector count to match the settings partition size that is 40 kB for this application. -CONFIG_SETTINGS_ZMS_SECTOR_COUNT=10 +CONFIG_SETTINGS_ZMS_NAME_CACHE=y +CONFIG_SETTINGS_ZMS_NAME_CACHE_SIZE=512 +CONFIG_ZMS_LOOKUP_CACHE_FOR_SETTINGS=y +CONFIG_SETTINGS_ZMS_NO_LL_DELETE=y + # 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 diff --git a/samples/matter/light_switch/boards/nrf54l15dk_nrf54l15_cpuapp.conf b/samples/matter/light_switch/boards/nrf54l15dk_nrf54l15_cpuapp.conf index 95a4004aca0b..3671ac9097de 100644 --- a/samples/matter/light_switch/boards/nrf54l15dk_nrf54l15_cpuapp.conf +++ b/samples/matter/light_switch/boards/nrf54l15dk_nrf54l15_cpuapp.conf @@ -7,8 +7,6 @@ # Multirole is the only currently supported role by SoftDevice. CONFIG_BT_LL_SOFTDEVICE_MULTIROLE=y -# Set the ZMS sector count to match the settings partition size that is 40 kB for this application. -CONFIG_SETTINGS_ZMS_SECTOR_COUNT=10 # 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 diff --git a/samples/matter/light_switch/boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf b/samples/matter/light_switch/boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf index 48281dc5eea4..162e3c61d69c 100644 --- a/samples/matter/light_switch/boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf +++ b/samples/matter/light_switch/boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf @@ -13,8 +13,6 @@ CONFIG_CHIP_FACTORY_DATA_WRITE_PROTECT=n # TODO: KRKNWK-19382: Disable NFC commissioning due to an issue with definitions for ns build. CONFIG_CHIP_NFC_COMMISSIONING=n -# Set the ZMS sector count to match the settings partition size that is 40 kB for this application. -CONFIG_SETTINGS_ZMS_SECTOR_COUNT=10 # 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 diff --git a/samples/matter/lock/boards/nrf54l15dk_nrf54l15_cpuapp.conf b/samples/matter/lock/boards/nrf54l15dk_nrf54l15_cpuapp.conf index 95a4004aca0b..4e35c065617f 100644 --- a/samples/matter/lock/boards/nrf54l15dk_nrf54l15_cpuapp.conf +++ b/samples/matter/lock/boards/nrf54l15dk_nrf54l15_cpuapp.conf @@ -7,8 +7,11 @@ # Multirole is the only currently supported role by SoftDevice. CONFIG_BT_LL_SOFTDEVICE_MULTIROLE=y -# Set the ZMS sector count to match the settings partition size that is 40 kB for this application. -CONFIG_SETTINGS_ZMS_SECTOR_COUNT=10 +CONFIG_SETTINGS_ZMS_NAME_CACHE=y +CONFIG_SETTINGS_ZMS_NAME_CACHE_SIZE=512 +CONFIG_ZMS_LOOKUP_CACHE_FOR_SETTINGS=y +CONFIG_SETTINGS_ZMS_NO_LL_DELETE=y + # 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 diff --git a/samples/matter/lock/boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf b/samples/matter/lock/boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf index 48281dc5eea4..430d3b7be7cc 100644 --- a/samples/matter/lock/boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf +++ b/samples/matter/lock/boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf @@ -13,8 +13,11 @@ CONFIG_CHIP_FACTORY_DATA_WRITE_PROTECT=n # TODO: KRKNWK-19382: Disable NFC commissioning due to an issue with definitions for ns build. CONFIG_CHIP_NFC_COMMISSIONING=n -# Set the ZMS sector count to match the settings partition size that is 40 kB for this application. -CONFIG_SETTINGS_ZMS_SECTOR_COUNT=10 +CONFIG_SETTINGS_ZMS_NAME_CACHE=y +CONFIG_SETTINGS_ZMS_NAME_CACHE_SIZE=512 +CONFIG_ZMS_LOOKUP_CACHE_FOR_SETTINGS=y +CONFIG_SETTINGS_ZMS_NO_LL_DELETE=y + # 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 diff --git a/samples/matter/smoke_co_alarm/boards/nrf54l15dk_nrf54l10_cpuapp.conf b/samples/matter/smoke_co_alarm/boards/nrf54l15dk_nrf54l10_cpuapp.conf index 95a4004aca0b..3671ac9097de 100644 --- a/samples/matter/smoke_co_alarm/boards/nrf54l15dk_nrf54l10_cpuapp.conf +++ b/samples/matter/smoke_co_alarm/boards/nrf54l15dk_nrf54l10_cpuapp.conf @@ -7,8 +7,6 @@ # Multirole is the only currently supported role by SoftDevice. CONFIG_BT_LL_SOFTDEVICE_MULTIROLE=y -# Set the ZMS sector count to match the settings partition size that is 40 kB for this application. -CONFIG_SETTINGS_ZMS_SECTOR_COUNT=10 # 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 diff --git a/samples/matter/smoke_co_alarm/boards/nrf54l15dk_nrf54l15_cpuapp.conf b/samples/matter/smoke_co_alarm/boards/nrf54l15dk_nrf54l15_cpuapp.conf index 95a4004aca0b..3671ac9097de 100644 --- a/samples/matter/smoke_co_alarm/boards/nrf54l15dk_nrf54l15_cpuapp.conf +++ b/samples/matter/smoke_co_alarm/boards/nrf54l15dk_nrf54l15_cpuapp.conf @@ -7,8 +7,6 @@ # Multirole is the only currently supported role by SoftDevice. CONFIG_BT_LL_SOFTDEVICE_MULTIROLE=y -# Set the ZMS sector count to match the settings partition size that is 40 kB for this application. -CONFIG_SETTINGS_ZMS_SECTOR_COUNT=10 # 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 diff --git a/samples/matter/template/boards/nrf54l15dk_nrf54l10_cpuapp.conf b/samples/matter/template/boards/nrf54l15dk_nrf54l10_cpuapp.conf index 56ffa14520e2..30bfa304d523 100644 --- a/samples/matter/template/boards/nrf54l15dk_nrf54l10_cpuapp.conf +++ b/samples/matter/template/boards/nrf54l15dk_nrf54l10_cpuapp.conf @@ -7,9 +7,6 @@ # Multirole is the only currently supported role by SoftDevice. CONFIG_BT_LL_SOFTDEVICE_MULTIROLE=y -# Set the ZMS sector count to match the settings partition size that is 40 kB for this application. -CONFIG_SETTINGS_ZMS_SECTOR_COUNT=10 - # 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 diff --git a/samples/matter/template/boards/nrf54l15dk_nrf54l15_cpuapp.conf b/samples/matter/template/boards/nrf54l15dk_nrf54l15_cpuapp.conf index 56ffa14520e2..30bfa304d523 100644 --- a/samples/matter/template/boards/nrf54l15dk_nrf54l15_cpuapp.conf +++ b/samples/matter/template/boards/nrf54l15dk_nrf54l15_cpuapp.conf @@ -7,9 +7,6 @@ # Multirole is the only currently supported role by SoftDevice. CONFIG_BT_LL_SOFTDEVICE_MULTIROLE=y -# Set the ZMS sector count to match the settings partition size that is 40 kB for this application. -CONFIG_SETTINGS_ZMS_SECTOR_COUNT=10 - # 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 diff --git a/samples/matter/template/boards/nrf54l15dk_nrf54l15_cpuapp_internal.conf b/samples/matter/template/boards/nrf54l15dk_nrf54l15_cpuapp_internal.conf index 8b6292dbc4f4..039b36212d19 100644 --- a/samples/matter/template/boards/nrf54l15dk_nrf54l15_cpuapp_internal.conf +++ b/samples/matter/template/boards/nrf54l15dk_nrf54l15_cpuapp_internal.conf @@ -7,8 +7,6 @@ # Multirole is the only currently supported role by SoftDevice. CONFIG_BT_LL_SOFTDEVICE_MULTIROLE=y -# Set the ZMS sector count to match the settings partition size that is 40 kB for this application. -CONFIG_SETTINGS_ZMS_SECTOR_COUNT=10 # 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 diff --git a/samples/matter/template/boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf b/samples/matter/template/boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf index 9fc3e5f5d76a..5e9c315fdf7c 100644 --- a/samples/matter/template/boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf +++ b/samples/matter/template/boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf @@ -10,8 +10,6 @@ CONFIG_BT_LL_SOFTDEVICE_MULTIROLE=y # TODO: Workaround to be removed once Zephyr's CONFIG_FPROTECT is supported on nRF54L_ns CONFIG_CHIP_FACTORY_DATA_WRITE_PROTECT=n -# Set the ZMS sector count to match the settings partition size that is 40 kB for this application. -CONFIG_SETTINGS_ZMS_SECTOR_COUNT=10 # 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 diff --git a/samples/matter/thermostat/boards/nrf54l15dk_nrf54l15_cpuapp.conf b/samples/matter/thermostat/boards/nrf54l15dk_nrf54l15_cpuapp.conf index 56ffa14520e2..30bfa304d523 100644 --- a/samples/matter/thermostat/boards/nrf54l15dk_nrf54l15_cpuapp.conf +++ b/samples/matter/thermostat/boards/nrf54l15dk_nrf54l15_cpuapp.conf @@ -7,9 +7,6 @@ # Multirole is the only currently supported role by SoftDevice. CONFIG_BT_LL_SOFTDEVICE_MULTIROLE=y -# Set the ZMS sector count to match the settings partition size that is 40 kB for this application. -CONFIG_SETTINGS_ZMS_SECTOR_COUNT=10 - # 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 diff --git a/samples/matter/thermostat/boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf b/samples/matter/thermostat/boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf index 48281dc5eea4..162e3c61d69c 100644 --- a/samples/matter/thermostat/boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf +++ b/samples/matter/thermostat/boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf @@ -13,8 +13,6 @@ CONFIG_CHIP_FACTORY_DATA_WRITE_PROTECT=n # TODO: KRKNWK-19382: Disable NFC commissioning due to an issue with definitions for ns build. CONFIG_CHIP_NFC_COMMISSIONING=n -# Set the ZMS sector count to match the settings partition size that is 40 kB for this application. -CONFIG_SETTINGS_ZMS_SECTOR_COUNT=10 # 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 diff --git a/samples/matter/window_covering/boards/nrf54l15dk_nrf54l15_cpuapp.conf b/samples/matter/window_covering/boards/nrf54l15dk_nrf54l15_cpuapp.conf index 95a4004aca0b..3671ac9097de 100644 --- a/samples/matter/window_covering/boards/nrf54l15dk_nrf54l15_cpuapp.conf +++ b/samples/matter/window_covering/boards/nrf54l15dk_nrf54l15_cpuapp.conf @@ -7,8 +7,6 @@ # Multirole is the only currently supported role by SoftDevice. CONFIG_BT_LL_SOFTDEVICE_MULTIROLE=y -# Set the ZMS sector count to match the settings partition size that is 40 kB for this application. -CONFIG_SETTINGS_ZMS_SECTOR_COUNT=10 # 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 diff --git a/samples/matter/window_covering/boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf b/samples/matter/window_covering/boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf index 48281dc5eea4..162e3c61d69c 100644 --- a/samples/matter/window_covering/boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf +++ b/samples/matter/window_covering/boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf @@ -13,8 +13,6 @@ CONFIG_CHIP_FACTORY_DATA_WRITE_PROTECT=n # TODO: KRKNWK-19382: Disable NFC commissioning due to an issue with definitions for ns build. CONFIG_CHIP_NFC_COMMISSIONING=n -# Set the ZMS sector count to match the settings partition size that is 40 kB for this application. -CONFIG_SETTINGS_ZMS_SECTOR_COUNT=10 # 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 diff --git a/samples/openthread/cli/boards/nrf54l15dk_nrf54l15_cpuapp.conf b/samples/openthread/cli/boards/nrf54l15dk_nrf54l15_cpuapp.conf index f6cb57237eea..29699b7792c5 100644 --- a/samples/openthread/cli/boards/nrf54l15dk_nrf54l15_cpuapp.conf +++ b/samples/openthread/cli/boards/nrf54l15dk_nrf54l15_cpuapp.conf @@ -17,3 +17,8 @@ CONFIG_SHELL_STACK_SIZE=5120 CONFIG_NVS=n CONFIG_ZMS=y CONFIG_SETTINGS_ZMS=y + +CONFIG_SETTINGS_ZMS_NAME_CACHE=y +CONFIG_SETTINGS_ZMS_NAME_CACHE_SIZE=512 +CONFIG_ZMS_LOOKUP_CACHE_FOR_SETTINGS=y +CONFIG_SETTINGS_ZMS_NO_LL_DELETE=y diff --git a/samples/openthread/coprocessor/boards/nrf54l15dk_nrf54l15_cpuapp.conf b/samples/openthread/coprocessor/boards/nrf54l15dk_nrf54l15_cpuapp.conf index 853052ea2878..11fdfdcaa170 100644 --- a/samples/openthread/coprocessor/boards/nrf54l15dk_nrf54l15_cpuapp.conf +++ b/samples/openthread/coprocessor/boards/nrf54l15dk_nrf54l15_cpuapp.conf @@ -11,3 +11,8 @@ CONFIG_SPI_NOR=n CONFIG_NVS=n CONFIG_ZMS=y CONFIG_SETTINGS_ZMS=y + +CONFIG_SETTINGS_ZMS_NAME_CACHE=y +CONFIG_SETTINGS_ZMS_NAME_CACHE_SIZE=512 +CONFIG_ZMS_LOOKUP_CACHE_FOR_SETTINGS=y +CONFIG_SETTINGS_ZMS_NO_LL_DELETE=y diff --git a/west.yml b/west.yml index 839ac2a37263..0af52f7ff9f0 100644 --- a/west.yml +++ b/west.yml @@ -66,7 +66,7 @@ manifest: # https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html - name: zephyr repo-path: sdk-zephyr - revision: 163004a98b1a59583840215e25f1d876d09d2df5 + revision: pull/2567/head import: # In addition to the zephyr repository itself, NCS also # imports the contents of zephyr/west.yml at the above From e3748102a55c18ba42c4244392f7ffc79cdea9bf Mon Sep 17 00:00:00 2001 From: Damian Krolik Date: Mon, 10 Mar 2025 15:59:50 +0100 Subject: [PATCH 2/2] DNM: add shell commands for fetching ZMS internal stats matter_settings zms_cycles matter_settings zms_key_collisions Signed-off-by: Damian Krolik --- .../persistent_storage_shell.cpp | 33 +++++++++++++++++++ west.yml | 2 +- 2 files changed, 34 insertions(+), 1 deletion(-) diff --git a/samples/matter/common/src/persistent_storage/persistent_storage_shell.cpp b/samples/matter/common/src/persistent_storage/persistent_storage_shell.cpp index 54764cec3bb3..f9083eac07d6 100644 --- a/samples/matter/common/src/persistent_storage/persistent_storage_shell.cpp +++ b/samples/matter/common/src/persistent_storage/persistent_storage_shell.cpp @@ -9,6 +9,7 @@ #if defined(CONFIG_SETTINGS_NVS) #include #elif defined(CONFIG_SETTINGS_ZMS) +#include #include #endif #include @@ -123,6 +124,30 @@ int FreeHandler(const struct shell *shell, size_t argc, char **argv) return 0; } +int ZmsCyclesHandler(const struct shell *shell, size_t argc, char **argv) +{ + if (!IS_ENABLED(CONFIG_SETTINGS_ZMS) || !sStorage) { + return -ENOEXEC; + } + + shell_print(shell, "%u", zms_get_num_cycles(sStorage)); + + return 0; +} + +int ZmsKeyCollisions(const struct shell *shell, size_t argc, char **argv) +{ + if (!IS_ENABLED(CONFIG_SETTINGS_ZMS) || !sStorage) { + return -ENOEXEC; + } + + settings_zms *backend = CONTAINER_OF(sStorage, settings_zms, cf_zms); + + shell_print(shell, "%u", static_cast(backend->hash_collision_num)); + + return 0; +} + } // namespace bool PersistentStorageShell::Init() @@ -163,6 +188,14 @@ SHELL_STATIC_SUBCMD_SET_CREATE(sub_persistent_storage, "Get free settings space in Bytes. \n" "Usage: matter_settings current\n", FreeHandler, 1, 1), + SHELL_CMD_ARG(zms_cycles, NULL, + "Get max number of ZMS sector cycles.\n" + "Usage: matter_settings zms_cycles\n)", + ZmsCyclesHandler, 1, 0), + SHELL_CMD_ARG(zms_key_collisions, NULL, + "Get max number of key hash collisions.\n" + "Usage: matter_settings zms_key_collisions\n)", + ZmsKeyCollisions, 1, 0), SHELL_SUBCMD_SET_END); SHELL_CMD_REGISTER(matter_settings, &sub_persistent_storage, "Matter persistent storage ", NULL); diff --git a/west.yml b/west.yml index 0af52f7ff9f0..f9b088e2624b 100644 --- a/west.yml +++ b/west.yml @@ -66,7 +66,7 @@ manifest: # https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html - name: zephyr repo-path: sdk-zephyr - revision: pull/2567/head + revision: pull/2596/head import: # In addition to the zephyr repository itself, NCS also # imports the contents of zephyr/west.yml at the above