From 6c2ef412d298b6426da3f6aa5113f54c00b15511 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 (auto-manifest PR) Automatically created by Github Action Signed-off-by: Nordic Builder --- west.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/west.yml b/west.yml index 93eb46d03b0..d84e05f014c 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: 0aa2141d605f3b39da2b541e2fe4595d58824080 + revision: pull/2525/head import: # In addition to the zephyr repository itself, NCS also # imports the contents of zephyr/west.yml at the above From 73bc43bfa230e92de6e88718b4b7988789dfd131 Mon Sep 17 00:00:00 2001 From: Riadh Ghaddab Date: Wed, 19 Feb 2025 14:37:37 +0100 Subject: [PATCH 2/2] storage: zms: remove unneeded KCONFIG options with the new ZMS backend for settings some Kconfig options are not needed and others must be enabled. Signed-off-by: Riadh Ghaddab --- .../matter_bridge/boards/nrf54h20dk_nrf54h20_cpuapp.conf | 2 -- doc/nrf/app_dev/device_guides/nrf54l/zms.rst | 3 --- .../boards/nrf54l15dk_nrf54l05_cpuapp.conf | 4 +--- .../boards/nrf54l15dk_nrf54l10_cpuapp.conf | 4 +--- .../boards/nrf54l15dk_nrf54l15_cpuapp.conf | 4 +--- .../mesh/chat/boards/nrf54l15dk_nrf54l05_cpuapp.conf | 4 +--- .../mesh/chat/boards/nrf54l15dk_nrf54l10_cpuapp.conf | 4 +--- .../mesh/chat/boards/nrf54l15dk_nrf54l15_cpuapp.conf | 4 +--- .../dfu/distributor/boards/nrf54l15dk_nrf54l10_cpuapp.conf | 4 +--- .../dfu/distributor/boards/nrf54l15dk_nrf54l15_cpuapp.conf | 4 +--- .../mesh/dfu/target/boards/nrf54l15dk_nrf54l10_cpuapp.conf | 4 +--- .../mesh/dfu/target/boards/nrf54l15dk_nrf54l15_cpuapp.conf | 4 +--- .../mesh/light/boards/nrf54l15dk_nrf54l05_cpuapp.conf | 4 +--- .../mesh/light/boards/nrf54l15dk_nrf54l10_cpuapp.conf | 4 +--- .../mesh/light/boards/nrf54l15dk_nrf54l15_cpuapp.conf | 4 +--- .../mesh/light_ctrl/boards/nrf54l15dk_nrf54l05_cpuapp.conf | 4 +--- .../mesh/light_ctrl/boards/nrf54l15dk_nrf54l10_cpuapp.conf | 4 +--- .../mesh/light_ctrl/boards/nrf54l15dk_nrf54l15_cpuapp.conf | 4 +--- .../mesh/light_dimmer/boards/nrf54l15dk_nrf54l05_cpuapp.conf | 4 +--- .../mesh/light_dimmer/boards/nrf54l15dk_nrf54l10_cpuapp.conf | 4 +--- .../mesh/light_dimmer/boards/nrf54l15dk_nrf54l15_cpuapp.conf | 4 +--- .../mesh/light_switch/boards/nrf54l15dk_nrf54l05_cpuapp.conf | 4 +--- .../mesh/light_switch/boards/nrf54l15dk_nrf54l10_cpuapp.conf | 4 +--- .../mesh/light_switch/boards/nrf54l15dk_nrf54l15_cpuapp.conf | 4 +--- .../mesh/sensor_client/boards/nrf54l15dk_nrf54l05_cpuapp.conf | 4 +--- .../mesh/sensor_client/boards/nrf54l15dk_nrf54l10_cpuapp.conf | 4 +--- .../mesh/sensor_client/boards/nrf54l15dk_nrf54l15_cpuapp.conf | 4 +--- .../mesh/sensor_server/boards/nrf54l15dk_nrf54l05_cpuapp.conf | 4 +--- .../mesh/sensor_server/boards/nrf54l15dk_nrf54l10_cpuapp.conf | 4 +--- .../mesh/sensor_server/boards/nrf54l15dk_nrf54l15_cpuapp.conf | 4 +--- .../silvair_enocean/boards/nrf54l15dk_nrf54l05_cpuapp.conf | 4 +--- .../silvair_enocean/boards/nrf54l15dk_nrf54l10_cpuapp.conf | 4 +--- .../silvair_enocean/boards/nrf54l15dk_nrf54l15_cpuapp.conf | 4 +--- .../matter/light_bulb/boards/nrf54l15dk_nrf54l15_cpuapp.conf | 3 --- .../light_bulb/boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf | 2 -- .../light_switch/boards/nrf54l15dk_nrf54l15_cpuapp.conf | 2 -- .../light_switch/boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf | 2 -- samples/matter/lock/boards/nrf54h20dk_nrf54h20_cpuapp.conf | 2 -- samples/matter/lock/boards/nrf54l15dk_nrf54l15_cpuapp.conf | 2 -- samples/matter/lock/boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf | 2 -- .../smoke_co_alarm/boards/nrf54l15dk_nrf54l10_cpuapp.conf | 2 -- .../smoke_co_alarm/boards/nrf54l15dk_nrf54l15_cpuapp.conf | 2 -- .../matter/template/boards/nrf54h20dk_nrf54h20_cpuapp.conf | 2 -- .../matter/template/boards/nrf54l15dk_nrf54l10_cpuapp.conf | 3 --- .../matter/template/boards/nrf54l15dk_nrf54l15_cpuapp.conf | 3 --- .../template/boards/nrf54l15dk_nrf54l15_cpuapp_internal.conf | 2 -- .../matter/template/boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf | 2 -- .../matter/thermostat/boards/nrf54l15dk_nrf54l15_cpuapp.conf | 3 --- .../thermostat/boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf | 2 -- .../window_covering/boards/nrf54l15dk_nrf54l15_cpuapp.conf | 2 -- .../window_covering/boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf | 2 -- west.yml | 2 +- 52 files changed, 32 insertions(+), 139 deletions(-) diff --git a/applications/matter_bridge/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/applications/matter_bridge/boards/nrf54h20dk_nrf54h20_cpuapp.conf index 57588c265ac..deac5de4ca7 100644 --- a/applications/matter_bridge/boards/nrf54h20dk_nrf54h20_cpuapp.conf +++ b/applications/matter_bridge/boards/nrf54h20dk_nrf54h20_cpuapp.conf @@ -13,8 +13,6 @@ 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 diff --git a/doc/nrf/app_dev/device_guides/nrf54l/zms.rst b/doc/nrf/app_dev/device_guides/nrf54l/zms.rst index 701d1533cc3..b8f84715a55 100644 --- a/doc/nrf/app_dev/device_guides/nrf54l/zms.rst +++ b/doc/nrf/app_dev/device_guides/nrf54l/zms.rst @@ -38,9 +38,6 @@ Additionally, you can optimize the application performance using caching mechani a. Enable the :kconfig:option:`CONFIG_ZMS_LOOKUP_CACHE` Kconfig option. #. Set the lookup cache size in :kconfig:option:`CONFIG_ZMS_LOOKUP_CACHE_SIZE` depending on your application needs. - #. Ensure the lookup cache is configured to support the Setting subsystem by enabling the :kconfig:option:`CONFIG_ZMS_LOOKUP_CACHE_FOR_SETTINGS` Kconfig option. - - #. To further enhance the performance, enable the :kconfig:option:`CONFIG_SETTINGS_ZMS_NAME_CACHE` Kconfig option, and configure its size with :kconfig:option:`CONFIG_SETTINGS_ZMS_NAME_CACHE_SIZE` according to your application needs. Optimizing ZMS in your application ********************************** 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 13b39eeabfb..c636ded8c8a 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,11 +11,9 @@ 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 -CONFIG_SETTINGS_ZMS_NAME_CACHE=y -CONFIG_SETTINGS_ZMS_NAME_CACHE_SIZE=512 -CONFIG_ZMS_LOOKUP_CACHE_FOR_SETTINGS=y CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=4096 CONFIG_BT_RX_STACK_SIZE=5120 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 55120e85651..22663df12b5 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,11 +11,9 @@ 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 -CONFIG_SETTINGS_ZMS_NAME_CACHE=y -CONFIG_SETTINGS_ZMS_NAME_CACHE_SIZE=512 -CONFIG_ZMS_LOOKUP_CACHE_FOR_SETTINGS=y CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=4096 CONFIG_BT_RX_STACK_SIZE=5120 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 995706b0255..80a83a3ec5c 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,11 +11,9 @@ 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 -CONFIG_SETTINGS_ZMS_NAME_CACHE=y -CONFIG_SETTINGS_ZMS_NAME_CACHE_SIZE=512 -CONFIG_ZMS_LOOKUP_CACHE_FOR_SETTINGS=y CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=4096 CONFIG_BT_RX_STACK_SIZE=5120 diff --git a/samples/bluetooth/mesh/chat/boards/nrf54l15dk_nrf54l05_cpuapp.conf b/samples/bluetooth/mesh/chat/boards/nrf54l15dk_nrf54l05_cpuapp.conf index 13b39eeabfb..c636ded8c8a 100644 --- a/samples/bluetooth/mesh/chat/boards/nrf54l15dk_nrf54l05_cpuapp.conf +++ b/samples/bluetooth/mesh/chat/boards/nrf54l15dk_nrf54l05_cpuapp.conf @@ -11,11 +11,9 @@ 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 -CONFIG_SETTINGS_ZMS_NAME_CACHE=y -CONFIG_SETTINGS_ZMS_NAME_CACHE_SIZE=512 -CONFIG_ZMS_LOOKUP_CACHE_FOR_SETTINGS=y CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=4096 CONFIG_BT_RX_STACK_SIZE=5120 diff --git a/samples/bluetooth/mesh/chat/boards/nrf54l15dk_nrf54l10_cpuapp.conf b/samples/bluetooth/mesh/chat/boards/nrf54l15dk_nrf54l10_cpuapp.conf index 55120e85651..22663df12b5 100644 --- a/samples/bluetooth/mesh/chat/boards/nrf54l15dk_nrf54l10_cpuapp.conf +++ b/samples/bluetooth/mesh/chat/boards/nrf54l15dk_nrf54l10_cpuapp.conf @@ -11,11 +11,9 @@ 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 -CONFIG_SETTINGS_ZMS_NAME_CACHE=y -CONFIG_SETTINGS_ZMS_NAME_CACHE_SIZE=512 -CONFIG_ZMS_LOOKUP_CACHE_FOR_SETTINGS=y CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=4096 CONFIG_BT_RX_STACK_SIZE=5120 diff --git a/samples/bluetooth/mesh/chat/boards/nrf54l15dk_nrf54l15_cpuapp.conf b/samples/bluetooth/mesh/chat/boards/nrf54l15dk_nrf54l15_cpuapp.conf index 995706b0255..80a83a3ec5c 100644 --- a/samples/bluetooth/mesh/chat/boards/nrf54l15dk_nrf54l15_cpuapp.conf +++ b/samples/bluetooth/mesh/chat/boards/nrf54l15dk_nrf54l15_cpuapp.conf @@ -11,11 +11,9 @@ 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 -CONFIG_SETTINGS_ZMS_NAME_CACHE=y -CONFIG_SETTINGS_ZMS_NAME_CACHE_SIZE=512 -CONFIG_ZMS_LOOKUP_CACHE_FOR_SETTINGS=y CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=4096 CONFIG_BT_RX_STACK_SIZE=5120 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 55120e85651..22663df12b5 100644 --- a/samples/bluetooth/mesh/dfu/distributor/boards/nrf54l15dk_nrf54l10_cpuapp.conf +++ b/samples/bluetooth/mesh/dfu/distributor/boards/nrf54l15dk_nrf54l10_cpuapp.conf @@ -11,11 +11,9 @@ 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 -CONFIG_SETTINGS_ZMS_NAME_CACHE=y -CONFIG_SETTINGS_ZMS_NAME_CACHE_SIZE=512 -CONFIG_ZMS_LOOKUP_CACHE_FOR_SETTINGS=y CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=4096 CONFIG_BT_RX_STACK_SIZE=5120 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 995706b0255..80a83a3ec5c 100644 --- a/samples/bluetooth/mesh/dfu/distributor/boards/nrf54l15dk_nrf54l15_cpuapp.conf +++ b/samples/bluetooth/mesh/dfu/distributor/boards/nrf54l15dk_nrf54l15_cpuapp.conf @@ -11,11 +11,9 @@ 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 -CONFIG_SETTINGS_ZMS_NAME_CACHE=y -CONFIG_SETTINGS_ZMS_NAME_CACHE_SIZE=512 -CONFIG_ZMS_LOOKUP_CACHE_FOR_SETTINGS=y CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=4096 CONFIG_BT_RX_STACK_SIZE=5120 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 55120e85651..22663df12b5 100644 --- a/samples/bluetooth/mesh/dfu/target/boards/nrf54l15dk_nrf54l10_cpuapp.conf +++ b/samples/bluetooth/mesh/dfu/target/boards/nrf54l15dk_nrf54l10_cpuapp.conf @@ -11,11 +11,9 @@ 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 -CONFIG_SETTINGS_ZMS_NAME_CACHE=y -CONFIG_SETTINGS_ZMS_NAME_CACHE_SIZE=512 -CONFIG_ZMS_LOOKUP_CACHE_FOR_SETTINGS=y CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=4096 CONFIG_BT_RX_STACK_SIZE=5120 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 995706b0255..80a83a3ec5c 100644 --- a/samples/bluetooth/mesh/dfu/target/boards/nrf54l15dk_nrf54l15_cpuapp.conf +++ b/samples/bluetooth/mesh/dfu/target/boards/nrf54l15dk_nrf54l15_cpuapp.conf @@ -11,11 +11,9 @@ 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 -CONFIG_SETTINGS_ZMS_NAME_CACHE=y -CONFIG_SETTINGS_ZMS_NAME_CACHE_SIZE=512 -CONFIG_ZMS_LOOKUP_CACHE_FOR_SETTINGS=y CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=4096 CONFIG_BT_RX_STACK_SIZE=5120 diff --git a/samples/bluetooth/mesh/light/boards/nrf54l15dk_nrf54l05_cpuapp.conf b/samples/bluetooth/mesh/light/boards/nrf54l15dk_nrf54l05_cpuapp.conf index b6b4e45f2f7..072459e0af0 100644 --- a/samples/bluetooth/mesh/light/boards/nrf54l15dk_nrf54l05_cpuapp.conf +++ b/samples/bluetooth/mesh/light/boards/nrf54l15dk_nrf54l05_cpuapp.conf @@ -12,11 +12,9 @@ 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 -CONFIG_SETTINGS_ZMS_NAME_CACHE=y -CONFIG_SETTINGS_ZMS_NAME_CACHE_SIZE=512 -CONFIG_ZMS_LOOKUP_CACHE_FOR_SETTINGS=y CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=4096 CONFIG_BT_RX_STACK_SIZE=5120 diff --git a/samples/bluetooth/mesh/light/boards/nrf54l15dk_nrf54l10_cpuapp.conf b/samples/bluetooth/mesh/light/boards/nrf54l15dk_nrf54l10_cpuapp.conf index 153a16959be..9b933af4fa9 100644 --- a/samples/bluetooth/mesh/light/boards/nrf54l15dk_nrf54l10_cpuapp.conf +++ b/samples/bluetooth/mesh/light/boards/nrf54l15dk_nrf54l10_cpuapp.conf @@ -12,11 +12,9 @@ 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 -CONFIG_SETTINGS_ZMS_NAME_CACHE=y -CONFIG_SETTINGS_ZMS_NAME_CACHE_SIZE=512 -CONFIG_ZMS_LOOKUP_CACHE_FOR_SETTINGS=y CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=4096 CONFIG_BT_RX_STACK_SIZE=5120 diff --git a/samples/bluetooth/mesh/light/boards/nrf54l15dk_nrf54l15_cpuapp.conf b/samples/bluetooth/mesh/light/boards/nrf54l15dk_nrf54l15_cpuapp.conf index 6412354a7c2..97bd3adf5b0 100644 --- a/samples/bluetooth/mesh/light/boards/nrf54l15dk_nrf54l15_cpuapp.conf +++ b/samples/bluetooth/mesh/light/boards/nrf54l15dk_nrf54l15_cpuapp.conf @@ -12,11 +12,9 @@ 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 -CONFIG_SETTINGS_ZMS_NAME_CACHE=y -CONFIG_SETTINGS_ZMS_NAME_CACHE_SIZE=512 -CONFIG_ZMS_LOOKUP_CACHE_FOR_SETTINGS=y CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=4096 CONFIG_BT_RX_STACK_SIZE=5120 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 13b39eeabfb..c636ded8c8a 100644 --- a/samples/bluetooth/mesh/light_ctrl/boards/nrf54l15dk_nrf54l05_cpuapp.conf +++ b/samples/bluetooth/mesh/light_ctrl/boards/nrf54l15dk_nrf54l05_cpuapp.conf @@ -11,11 +11,9 @@ 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 -CONFIG_SETTINGS_ZMS_NAME_CACHE=y -CONFIG_SETTINGS_ZMS_NAME_CACHE_SIZE=512 -CONFIG_ZMS_LOOKUP_CACHE_FOR_SETTINGS=y CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=4096 CONFIG_BT_RX_STACK_SIZE=5120 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 55120e85651..22663df12b5 100644 --- a/samples/bluetooth/mesh/light_ctrl/boards/nrf54l15dk_nrf54l10_cpuapp.conf +++ b/samples/bluetooth/mesh/light_ctrl/boards/nrf54l15dk_nrf54l10_cpuapp.conf @@ -11,11 +11,9 @@ 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 -CONFIG_SETTINGS_ZMS_NAME_CACHE=y -CONFIG_SETTINGS_ZMS_NAME_CACHE_SIZE=512 -CONFIG_ZMS_LOOKUP_CACHE_FOR_SETTINGS=y CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=4096 CONFIG_BT_RX_STACK_SIZE=5120 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 995706b0255..80a83a3ec5c 100644 --- a/samples/bluetooth/mesh/light_ctrl/boards/nrf54l15dk_nrf54l15_cpuapp.conf +++ b/samples/bluetooth/mesh/light_ctrl/boards/nrf54l15dk_nrf54l15_cpuapp.conf @@ -11,11 +11,9 @@ 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 -CONFIG_SETTINGS_ZMS_NAME_CACHE=y -CONFIG_SETTINGS_ZMS_NAME_CACHE_SIZE=512 -CONFIG_ZMS_LOOKUP_CACHE_FOR_SETTINGS=y CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=4096 CONFIG_BT_RX_STACK_SIZE=5120 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 13b39eeabfb..c636ded8c8a 100644 --- a/samples/bluetooth/mesh/light_dimmer/boards/nrf54l15dk_nrf54l05_cpuapp.conf +++ b/samples/bluetooth/mesh/light_dimmer/boards/nrf54l15dk_nrf54l05_cpuapp.conf @@ -11,11 +11,9 @@ 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 -CONFIG_SETTINGS_ZMS_NAME_CACHE=y -CONFIG_SETTINGS_ZMS_NAME_CACHE_SIZE=512 -CONFIG_ZMS_LOOKUP_CACHE_FOR_SETTINGS=y CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=4096 CONFIG_BT_RX_STACK_SIZE=5120 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 55120e85651..22663df12b5 100644 --- a/samples/bluetooth/mesh/light_dimmer/boards/nrf54l15dk_nrf54l10_cpuapp.conf +++ b/samples/bluetooth/mesh/light_dimmer/boards/nrf54l15dk_nrf54l10_cpuapp.conf @@ -11,11 +11,9 @@ 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 -CONFIG_SETTINGS_ZMS_NAME_CACHE=y -CONFIG_SETTINGS_ZMS_NAME_CACHE_SIZE=512 -CONFIG_ZMS_LOOKUP_CACHE_FOR_SETTINGS=y CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=4096 CONFIG_BT_RX_STACK_SIZE=5120 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 995706b0255..80a83a3ec5c 100644 --- a/samples/bluetooth/mesh/light_dimmer/boards/nrf54l15dk_nrf54l15_cpuapp.conf +++ b/samples/bluetooth/mesh/light_dimmer/boards/nrf54l15dk_nrf54l15_cpuapp.conf @@ -11,11 +11,9 @@ 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 -CONFIG_SETTINGS_ZMS_NAME_CACHE=y -CONFIG_SETTINGS_ZMS_NAME_CACHE_SIZE=512 -CONFIG_ZMS_LOOKUP_CACHE_FOR_SETTINGS=y CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=4096 CONFIG_BT_RX_STACK_SIZE=5120 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 13b39eeabfb..c636ded8c8a 100644 --- a/samples/bluetooth/mesh/light_switch/boards/nrf54l15dk_nrf54l05_cpuapp.conf +++ b/samples/bluetooth/mesh/light_switch/boards/nrf54l15dk_nrf54l05_cpuapp.conf @@ -11,11 +11,9 @@ 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 -CONFIG_SETTINGS_ZMS_NAME_CACHE=y -CONFIG_SETTINGS_ZMS_NAME_CACHE_SIZE=512 -CONFIG_ZMS_LOOKUP_CACHE_FOR_SETTINGS=y CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=4096 CONFIG_BT_RX_STACK_SIZE=5120 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 55120e85651..22663df12b5 100644 --- a/samples/bluetooth/mesh/light_switch/boards/nrf54l15dk_nrf54l10_cpuapp.conf +++ b/samples/bluetooth/mesh/light_switch/boards/nrf54l15dk_nrf54l10_cpuapp.conf @@ -11,11 +11,9 @@ 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 -CONFIG_SETTINGS_ZMS_NAME_CACHE=y -CONFIG_SETTINGS_ZMS_NAME_CACHE_SIZE=512 -CONFIG_ZMS_LOOKUP_CACHE_FOR_SETTINGS=y CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=4096 CONFIG_BT_RX_STACK_SIZE=5120 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 995706b0255..80a83a3ec5c 100644 --- a/samples/bluetooth/mesh/light_switch/boards/nrf54l15dk_nrf54l15_cpuapp.conf +++ b/samples/bluetooth/mesh/light_switch/boards/nrf54l15dk_nrf54l15_cpuapp.conf @@ -11,11 +11,9 @@ 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 -CONFIG_SETTINGS_ZMS_NAME_CACHE=y -CONFIG_SETTINGS_ZMS_NAME_CACHE_SIZE=512 -CONFIG_ZMS_LOOKUP_CACHE_FOR_SETTINGS=y CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=4096 CONFIG_BT_RX_STACK_SIZE=5120 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 13b39eeabfb..c636ded8c8a 100644 --- a/samples/bluetooth/mesh/sensor_client/boards/nrf54l15dk_nrf54l05_cpuapp.conf +++ b/samples/bluetooth/mesh/sensor_client/boards/nrf54l15dk_nrf54l05_cpuapp.conf @@ -11,11 +11,9 @@ 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 -CONFIG_SETTINGS_ZMS_NAME_CACHE=y -CONFIG_SETTINGS_ZMS_NAME_CACHE_SIZE=512 -CONFIG_ZMS_LOOKUP_CACHE_FOR_SETTINGS=y CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=4096 CONFIG_BT_RX_STACK_SIZE=5120 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 55120e85651..22663df12b5 100644 --- a/samples/bluetooth/mesh/sensor_client/boards/nrf54l15dk_nrf54l10_cpuapp.conf +++ b/samples/bluetooth/mesh/sensor_client/boards/nrf54l15dk_nrf54l10_cpuapp.conf @@ -11,11 +11,9 @@ 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 -CONFIG_SETTINGS_ZMS_NAME_CACHE=y -CONFIG_SETTINGS_ZMS_NAME_CACHE_SIZE=512 -CONFIG_ZMS_LOOKUP_CACHE_FOR_SETTINGS=y CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=4096 CONFIG_BT_RX_STACK_SIZE=5120 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 995706b0255..80a83a3ec5c 100644 --- a/samples/bluetooth/mesh/sensor_client/boards/nrf54l15dk_nrf54l15_cpuapp.conf +++ b/samples/bluetooth/mesh/sensor_client/boards/nrf54l15dk_nrf54l15_cpuapp.conf @@ -11,11 +11,9 @@ 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 -CONFIG_SETTINGS_ZMS_NAME_CACHE=y -CONFIG_SETTINGS_ZMS_NAME_CACHE_SIZE=512 -CONFIG_ZMS_LOOKUP_CACHE_FOR_SETTINGS=y CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=4096 CONFIG_BT_RX_STACK_SIZE=5120 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 13b39eeabfb..c636ded8c8a 100644 --- a/samples/bluetooth/mesh/sensor_server/boards/nrf54l15dk_nrf54l05_cpuapp.conf +++ b/samples/bluetooth/mesh/sensor_server/boards/nrf54l15dk_nrf54l05_cpuapp.conf @@ -11,11 +11,9 @@ 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 -CONFIG_SETTINGS_ZMS_NAME_CACHE=y -CONFIG_SETTINGS_ZMS_NAME_CACHE_SIZE=512 -CONFIG_ZMS_LOOKUP_CACHE_FOR_SETTINGS=y CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=4096 CONFIG_BT_RX_STACK_SIZE=5120 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 55120e85651..22663df12b5 100644 --- a/samples/bluetooth/mesh/sensor_server/boards/nrf54l15dk_nrf54l10_cpuapp.conf +++ b/samples/bluetooth/mesh/sensor_server/boards/nrf54l15dk_nrf54l10_cpuapp.conf @@ -11,11 +11,9 @@ 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 -CONFIG_SETTINGS_ZMS_NAME_CACHE=y -CONFIG_SETTINGS_ZMS_NAME_CACHE_SIZE=512 -CONFIG_ZMS_LOOKUP_CACHE_FOR_SETTINGS=y CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=4096 CONFIG_BT_RX_STACK_SIZE=5120 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 995706b0255..80a83a3ec5c 100644 --- a/samples/bluetooth/mesh/sensor_server/boards/nrf54l15dk_nrf54l15_cpuapp.conf +++ b/samples/bluetooth/mesh/sensor_server/boards/nrf54l15dk_nrf54l15_cpuapp.conf @@ -11,11 +11,9 @@ 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 -CONFIG_SETTINGS_ZMS_NAME_CACHE=y -CONFIG_SETTINGS_ZMS_NAME_CACHE_SIZE=512 -CONFIG_ZMS_LOOKUP_CACHE_FOR_SETTINGS=y CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=4096 CONFIG_BT_RX_STACK_SIZE=5120 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 13b39eeabfb..c636ded8c8a 100644 --- a/samples/bluetooth/mesh/silvair_enocean/boards/nrf54l15dk_nrf54l05_cpuapp.conf +++ b/samples/bluetooth/mesh/silvair_enocean/boards/nrf54l15dk_nrf54l05_cpuapp.conf @@ -11,11 +11,9 @@ 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 -CONFIG_SETTINGS_ZMS_NAME_CACHE=y -CONFIG_SETTINGS_ZMS_NAME_CACHE_SIZE=512 -CONFIG_ZMS_LOOKUP_CACHE_FOR_SETTINGS=y CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=4096 CONFIG_BT_RX_STACK_SIZE=5120 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 55120e85651..22663df12b5 100644 --- a/samples/bluetooth/mesh/silvair_enocean/boards/nrf54l15dk_nrf54l10_cpuapp.conf +++ b/samples/bluetooth/mesh/silvair_enocean/boards/nrf54l15dk_nrf54l10_cpuapp.conf @@ -11,11 +11,9 @@ 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 -CONFIG_SETTINGS_ZMS_NAME_CACHE=y -CONFIG_SETTINGS_ZMS_NAME_CACHE_SIZE=512 -CONFIG_ZMS_LOOKUP_CACHE_FOR_SETTINGS=y CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=4096 CONFIG_BT_RX_STACK_SIZE=5120 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 995706b0255..80a83a3ec5c 100644 --- a/samples/bluetooth/mesh/silvair_enocean/boards/nrf54l15dk_nrf54l15_cpuapp.conf +++ b/samples/bluetooth/mesh/silvair_enocean/boards/nrf54l15dk_nrf54l15_cpuapp.conf @@ -11,11 +11,9 @@ 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 -CONFIG_SETTINGS_ZMS_NAME_CACHE=y -CONFIG_SETTINGS_ZMS_NAME_CACHE_SIZE=512 -CONFIG_ZMS_LOOKUP_CACHE_FOR_SETTINGS=y CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=4096 CONFIG_BT_RX_STACK_SIZE=5120 diff --git a/samples/matter/light_bulb/boards/nrf54l15dk_nrf54l15_cpuapp.conf b/samples/matter/light_bulb/boards/nrf54l15dk_nrf54l15_cpuapp.conf index 56ffa14520e..30bfa304d52 100644 --- a/samples/matter/light_bulb/boards/nrf54l15dk_nrf54l15_cpuapp.conf +++ b/samples/matter/light_bulb/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/light_bulb/boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf b/samples/matter/light_bulb/boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf index 48281dc5eea..162e3c61d69 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,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/light_switch/boards/nrf54l15dk_nrf54l15_cpuapp.conf b/samples/matter/light_switch/boards/nrf54l15dk_nrf54l15_cpuapp.conf index 95a4004aca0..3671ac9097d 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 48281dc5eea..162e3c61d69 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/nrf54h20dk_nrf54h20_cpuapp.conf b/samples/matter/lock/boards/nrf54h20dk_nrf54h20_cpuapp.conf index 46f0e02fe3f..ccfd1d83801 100644 --- a/samples/matter/lock/boards/nrf54h20dk_nrf54h20_cpuapp.conf +++ b/samples/matter/lock/boards/nrf54h20dk_nrf54h20_cpuapp.conf @@ -18,8 +18,6 @@ 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 diff --git a/samples/matter/lock/boards/nrf54l15dk_nrf54l15_cpuapp.conf b/samples/matter/lock/boards/nrf54l15dk_nrf54l15_cpuapp.conf index 95a4004aca0..3671ac9097d 100644 --- a/samples/matter/lock/boards/nrf54l15dk_nrf54l15_cpuapp.conf +++ b/samples/matter/lock/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/lock/boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf b/samples/matter/lock/boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf index 48281dc5eea..162e3c61d69 100644 --- a/samples/matter/lock/boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf +++ b/samples/matter/lock/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/smoke_co_alarm/boards/nrf54l15dk_nrf54l10_cpuapp.conf b/samples/matter/smoke_co_alarm/boards/nrf54l15dk_nrf54l10_cpuapp.conf index 95a4004aca0..3671ac9097d 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 95a4004aca0..3671ac9097d 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/nrf54h20dk_nrf54h20_cpuapp.conf b/samples/matter/template/boards/nrf54h20dk_nrf54h20_cpuapp.conf index 20869950acc..770cb84b90e 100644 --- a/samples/matter/template/boards/nrf54h20dk_nrf54h20_cpuapp.conf +++ b/samples/matter/template/boards/nrf54h20dk_nrf54h20_cpuapp.conf @@ -14,8 +14,6 @@ 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 diff --git a/samples/matter/template/boards/nrf54l15dk_nrf54l10_cpuapp.conf b/samples/matter/template/boards/nrf54l15dk_nrf54l10_cpuapp.conf index 56ffa14520e..30bfa304d52 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 56ffa14520e..30bfa304d52 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 8b6292dbc4f..039b36212d1 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 9fc3e5f5d76..5e9c315fdf7 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 56ffa14520e..30bfa304d52 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 48281dc5eea..162e3c61d69 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 95a4004aca0..3671ac9097d 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 48281dc5eea..162e3c61d69 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/west.yml b/west.yml index d84e05f014c..2946bca68da 100644 --- a/west.yml +++ b/west.yml @@ -157,7 +157,7 @@ manifest: - name: matter repo-path: sdk-connectedhomeip path: modules/lib/matter - revision: 7e18666ee36cd752e69924c6cf0eb1056716a3cb + revision: pull/557/head west-commands: scripts/west/west-commands.yml submodules: - name: nlio