storage: zms: remove unneeded KCONFIG options

rghaddab · rghaddab · commit a5526fbb1093 · 2025-02-26T19:56:18.000+01:00
with the new ZMS backend for settings some Kconfig options are not
needed and others must be enabled.

Signed-off-by: Riadh Ghaddab &lt;rghaddab@baylibre.com&gt;
(cherry picked from commit 794da992dc4702f235ccd11f0852b2f7a61c78f2)
diff --git a/applications/matter_bridge/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/applications/matter_bridge/boards/nrf54h20dk_nrf54h20_cpuapp.conf
@@ -16,8 +16,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
@@ -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
@@ -11,9 +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
-CONFIG_SETTINGS_ZMS_NAME_CACHE=y
-CONFIG_SETTINGS_ZMS_NAME_CACHE_SIZE=512
-CONFIG_ZMS_LOOKUP_CACHE_FOR_SETTINGS=y
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
@@ -11,9 +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
-CONFIG_SETTINGS_ZMS_NAME_CACHE=y
-CONFIG_SETTINGS_ZMS_NAME_CACHE_SIZE=512
-CONFIG_ZMS_LOOKUP_CACHE_FOR_SETTINGS=y
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
@@ -11,9 +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
-CONFIG_SETTINGS_ZMS_NAME_CACHE=y
-CONFIG_SETTINGS_ZMS_NAME_CACHE_SIZE=512
-CONFIG_ZMS_LOOKUP_CACHE_FOR_SETTINGS=y
diff --git a/samples/bluetooth/mesh/chat/boards/nrf54l15dk_nrf54l05_cpuapp.conf b/samples/bluetooth/mesh/chat/boards/nrf54l15dk_nrf54l05_cpuapp.conf
@@ -11,9 +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
-CONFIG_SETTINGS_ZMS_NAME_CACHE=y
-CONFIG_SETTINGS_ZMS_NAME_CACHE_SIZE=512
-CONFIG_ZMS_LOOKUP_CACHE_FOR_SETTINGS=y
diff --git a/samples/bluetooth/mesh/chat/boards/nrf54l15dk_nrf54l10_cpuapp.conf b/samples/bluetooth/mesh/chat/boards/nrf54l15dk_nrf54l10_cpuapp.conf
@@ -11,9 +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
-CONFIG_SETTINGS_ZMS_NAME_CACHE=y
-CONFIG_SETTINGS_ZMS_NAME_CACHE_SIZE=512
-CONFIG_ZMS_LOOKUP_CACHE_FOR_SETTINGS=y
diff --git a/samples/bluetooth/mesh/chat/boards/nrf54l15dk_nrf54l15_cpuapp.conf b/samples/bluetooth/mesh/chat/boards/nrf54l15dk_nrf54l15_cpuapp.conf
@@ -11,9 +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
-CONFIG_SETTINGS_ZMS_NAME_CACHE=y
-CONFIG_SETTINGS_ZMS_NAME_CACHE_SIZE=512
-CONFIG_ZMS_LOOKUP_CACHE_FOR_SETTINGS=y
diff --git a/samples/bluetooth/mesh/dfu/distributor/boards/nrf54l15dk_nrf54l10_cpuapp.conf b/samples/bluetooth/mesh/dfu/distributor/boards/nrf54l15dk_nrf54l10_cpuapp.conf
@@ -11,9 +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
-CONFIG_SETTINGS_ZMS_NAME_CACHE=y
-CONFIG_SETTINGS_ZMS_NAME_CACHE_SIZE=512
-CONFIG_ZMS_LOOKUP_CACHE_FOR_SETTINGS=y
diff --git a/samples/bluetooth/mesh/dfu/distributor/boards/nrf54l15dk_nrf54l15_cpuapp.conf b/samples/bluetooth/mesh/dfu/distributor/boards/nrf54l15dk_nrf54l15_cpuapp.conf
@@ -11,9 +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
-CONFIG_SETTINGS_ZMS_NAME_CACHE=y
-CONFIG_SETTINGS_ZMS_NAME_CACHE_SIZE=512
-CONFIG_ZMS_LOOKUP_CACHE_FOR_SETTINGS=y
diff --git a/samples/bluetooth/mesh/dfu/target/boards/nrf54l15dk_nrf54l10_cpuapp.conf b/samples/bluetooth/mesh/dfu/target/boards/nrf54l15dk_nrf54l10_cpuapp.conf
@@ -11,9 +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
-CONFIG_SETTINGS_ZMS_NAME_CACHE=y
-CONFIG_SETTINGS_ZMS_NAME_CACHE_SIZE=512
-CONFIG_ZMS_LOOKUP_CACHE_FOR_SETTINGS=y
diff --git a/samples/bluetooth/mesh/dfu/target/boards/nrf54l15dk_nrf54l15_cpuapp.conf b/samples/bluetooth/mesh/dfu/target/boards/nrf54l15dk_nrf54l15_cpuapp.conf
@@ -11,9 +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
-CONFIG_SETTINGS_ZMS_NAME_CACHE=y
-CONFIG_SETTINGS_ZMS_NAME_CACHE_SIZE=512
-CONFIG_ZMS_LOOKUP_CACHE_FOR_SETTINGS=y
diff --git a/samples/bluetooth/mesh/light/boards/nrf54l15dk_nrf54l05_cpuapp.conf b/samples/bluetooth/mesh/light/boards/nrf54l15dk_nrf54l05_cpuapp.conf
@@ -12,9 +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
-CONFIG_SETTINGS_ZMS_NAME_CACHE=y
-CONFIG_SETTINGS_ZMS_NAME_CACHE_SIZE=512
-CONFIG_ZMS_LOOKUP_CACHE_FOR_SETTINGS=y
diff --git a/samples/bluetooth/mesh/light/boards/nrf54l15dk_nrf54l10_cpuapp.conf b/samples/bluetooth/mesh/light/boards/nrf54l15dk_nrf54l10_cpuapp.conf
@@ -12,9 +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
-CONFIG_SETTINGS_ZMS_NAME_CACHE=y
-CONFIG_SETTINGS_ZMS_NAME_CACHE_SIZE=512
-CONFIG_ZMS_LOOKUP_CACHE_FOR_SETTINGS=y
diff --git a/samples/bluetooth/mesh/light/boards/nrf54l15dk_nrf54l15_cpuapp.conf b/samples/bluetooth/mesh/light/boards/nrf54l15dk_nrf54l15_cpuapp.conf
@@ -12,9 +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
-CONFIG_SETTINGS_ZMS_NAME_CACHE=y
-CONFIG_SETTINGS_ZMS_NAME_CACHE_SIZE=512
-CONFIG_ZMS_LOOKUP_CACHE_FOR_SETTINGS=y
diff --git a/samples/bluetooth/mesh/light_ctrl/boards/nrf54l15dk_nrf54l05_cpuapp.conf b/samples/bluetooth/mesh/light_ctrl/boards/nrf54l15dk_nrf54l05_cpuapp.conf
@@ -11,9 +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
-CONFIG_SETTINGS_ZMS_NAME_CACHE=y
-CONFIG_SETTINGS_ZMS_NAME_CACHE_SIZE=512
-CONFIG_ZMS_LOOKUP_CACHE_FOR_SETTINGS=y
diff --git a/samples/bluetooth/mesh/light_ctrl/boards/nrf54l15dk_nrf54l10_cpuapp.conf b/samples/bluetooth/mesh/light_ctrl/boards/nrf54l15dk_nrf54l10_cpuapp.conf
@@ -11,9 +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
-CONFIG_SETTINGS_ZMS_NAME_CACHE=y
-CONFIG_SETTINGS_ZMS_NAME_CACHE_SIZE=512
-CONFIG_ZMS_LOOKUP_CACHE_FOR_SETTINGS=y
diff --git a/samples/bluetooth/mesh/light_ctrl/boards/nrf54l15dk_nrf54l15_cpuapp.conf b/samples/bluetooth/mesh/light_ctrl/boards/nrf54l15dk_nrf54l15_cpuapp.conf
@@ -11,9 +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
-CONFIG_SETTINGS_ZMS_NAME_CACHE=y
-CONFIG_SETTINGS_ZMS_NAME_CACHE_SIZE=512
-CONFIG_ZMS_LOOKUP_CACHE_FOR_SETTINGS=y
diff --git a/samples/bluetooth/mesh/light_dimmer/boards/nrf54l15dk_nrf54l05_cpuapp.conf b/samples/bluetooth/mesh/light_dimmer/boards/nrf54l15dk_nrf54l05_cpuapp.conf
@@ -11,9 +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
-CONFIG_SETTINGS_ZMS_NAME_CACHE=y
-CONFIG_SETTINGS_ZMS_NAME_CACHE_SIZE=512
-CONFIG_ZMS_LOOKUP_CACHE_FOR_SETTINGS=y
diff --git a/samples/bluetooth/mesh/light_dimmer/boards/nrf54l15dk_nrf54l10_cpuapp.conf b/samples/bluetooth/mesh/light_dimmer/boards/nrf54l15dk_nrf54l10_cpuapp.conf
@@ -11,9 +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
-CONFIG_SETTINGS_ZMS_NAME_CACHE=y
-CONFIG_SETTINGS_ZMS_NAME_CACHE_SIZE=512
-CONFIG_ZMS_LOOKUP_CACHE_FOR_SETTINGS=y
diff --git a/samples/bluetooth/mesh/light_dimmer/boards/nrf54l15dk_nrf54l15_cpuapp.conf b/samples/bluetooth/mesh/light_dimmer/boards/nrf54l15dk_nrf54l15_cpuapp.conf
@@ -11,9 +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
-CONFIG_SETTINGS_ZMS_NAME_CACHE=y
-CONFIG_SETTINGS_ZMS_NAME_CACHE_SIZE=512
-CONFIG_ZMS_LOOKUP_CACHE_FOR_SETTINGS=y
diff --git a/samples/bluetooth/mesh/light_switch/boards/nrf54l15dk_nrf54l05_cpuapp.conf b/samples/bluetooth/mesh/light_switch/boards/nrf54l15dk_nrf54l05_cpuapp.conf
@@ -11,9 +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
-CONFIG_SETTINGS_ZMS_NAME_CACHE=y
-CONFIG_SETTINGS_ZMS_NAME_CACHE_SIZE=512
-CONFIG_ZMS_LOOKUP_CACHE_FOR_SETTINGS=y
diff --git a/samples/bluetooth/mesh/light_switch/boards/nrf54l15dk_nrf54l10_cpuapp.conf b/samples/bluetooth/mesh/light_switch/boards/nrf54l15dk_nrf54l10_cpuapp.conf
@@ -11,9 +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
-CONFIG_SETTINGS_ZMS_NAME_CACHE=y
-CONFIG_SETTINGS_ZMS_NAME_CACHE_SIZE=512
-CONFIG_ZMS_LOOKUP_CACHE_FOR_SETTINGS=y
diff --git a/samples/bluetooth/mesh/light_switch/boards/nrf54l15dk_nrf54l15_cpuapp.conf b/samples/bluetooth/mesh/light_switch/boards/nrf54l15dk_nrf54l15_cpuapp.conf
@@ -11,9 +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
-CONFIG_SETTINGS_ZMS_NAME_CACHE=y
-CONFIG_SETTINGS_ZMS_NAME_CACHE_SIZE=512
-CONFIG_ZMS_LOOKUP_CACHE_FOR_SETTINGS=y
diff --git a/samples/bluetooth/mesh/sensor_client/boards/nrf54l15dk_nrf54l05_cpuapp.conf b/samples/bluetooth/mesh/sensor_client/boards/nrf54l15dk_nrf54l05_cpuapp.conf
@@ -11,9 +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
-CONFIG_SETTINGS_ZMS_NAME_CACHE=y
-CONFIG_SETTINGS_ZMS_NAME_CACHE_SIZE=512
-CONFIG_ZMS_LOOKUP_CACHE_FOR_SETTINGS=y
diff --git a/samples/bluetooth/mesh/sensor_client/boards/nrf54l15dk_nrf54l10_cpuapp.conf b/samples/bluetooth/mesh/sensor_client/boards/nrf54l15dk_nrf54l10_cpuapp.conf
@@ -11,9 +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
-CONFIG_SETTINGS_ZMS_NAME_CACHE=y
-CONFIG_SETTINGS_ZMS_NAME_CACHE_SIZE=512
-CONFIG_ZMS_LOOKUP_CACHE_FOR_SETTINGS=y
diff --git a/samples/bluetooth/mesh/sensor_client/boards/nrf54l15dk_nrf54l15_cpuapp.conf b/samples/bluetooth/mesh/sensor_client/boards/nrf54l15dk_nrf54l15_cpuapp.conf
@@ -11,9 +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
-CONFIG_SETTINGS_ZMS_NAME_CACHE=y
-CONFIG_SETTINGS_ZMS_NAME_CACHE_SIZE=512
-CONFIG_ZMS_LOOKUP_CACHE_FOR_SETTINGS=y
diff --git a/samples/bluetooth/mesh/sensor_server/boards/nrf54l15dk_nrf54l05_cpuapp.conf b/samples/bluetooth/mesh/sensor_server/boards/nrf54l15dk_nrf54l05_cpuapp.conf
@@ -11,9 +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
-CONFIG_SETTINGS_ZMS_NAME_CACHE=y
-CONFIG_SETTINGS_ZMS_NAME_CACHE_SIZE=512
-CONFIG_ZMS_LOOKUP_CACHE_FOR_SETTINGS=y
diff --git a/samples/bluetooth/mesh/sensor_server/boards/nrf54l15dk_nrf54l10_cpuapp.conf b/samples/bluetooth/mesh/sensor_server/boards/nrf54l15dk_nrf54l10_cpuapp.conf
@@ -11,9 +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
-CONFIG_SETTINGS_ZMS_NAME_CACHE=y
-CONFIG_SETTINGS_ZMS_NAME_CACHE_SIZE=512
-CONFIG_ZMS_LOOKUP_CACHE_FOR_SETTINGS=y
diff --git a/samples/bluetooth/mesh/sensor_server/boards/nrf54l15dk_nrf54l15_cpuapp.conf b/samples/bluetooth/mesh/sensor_server/boards/nrf54l15dk_nrf54l15_cpuapp.conf
@@ -11,9 +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
-CONFIG_SETTINGS_ZMS_NAME_CACHE=y
-CONFIG_SETTINGS_ZMS_NAME_CACHE_SIZE=512
-CONFIG_ZMS_LOOKUP_CACHE_FOR_SETTINGS=y
diff --git a/samples/bluetooth/mesh/silvair_enocean/boards/nrf54l15dk_nrf54l05_cpuapp.conf b/samples/bluetooth/mesh/silvair_enocean/boards/nrf54l15dk_nrf54l05_cpuapp.conf
@@ -11,9 +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
-CONFIG_SETTINGS_ZMS_NAME_CACHE=y
-CONFIG_SETTINGS_ZMS_NAME_CACHE_SIZE=512
-CONFIG_ZMS_LOOKUP_CACHE_FOR_SETTINGS=y
diff --git a/samples/bluetooth/mesh/silvair_enocean/boards/nrf54l15dk_nrf54l10_cpuapp.conf b/samples/bluetooth/mesh/silvair_enocean/boards/nrf54l15dk_nrf54l10_cpuapp.conf
@@ -11,9 +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
-CONFIG_SETTINGS_ZMS_NAME_CACHE=y
-CONFIG_SETTINGS_ZMS_NAME_CACHE_SIZE=512
-CONFIG_ZMS_LOOKUP_CACHE_FOR_SETTINGS=y
diff --git a/samples/bluetooth/mesh/silvair_enocean/boards/nrf54l15dk_nrf54l15_cpuapp.conf b/samples/bluetooth/mesh/silvair_enocean/boards/nrf54l15dk_nrf54l15_cpuapp.conf
@@ -11,9 +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
-CONFIG_SETTINGS_ZMS_NAME_CACHE=y
-CONFIG_SETTINGS_ZMS_NAME_CACHE_SIZE=512
-CONFIG_ZMS_LOOKUP_CACHE_FOR_SETTINGS=y
diff --git a/samples/matter/light_bulb/boards/nrf54l15dk_nrf54l15_cpuapp.conf b/samples/matter/light_bulb/boards/nrf54l15dk_nrf54l15_cpuapp.conf
@@ -11,9 +11,6 @@ CONFIG_BT_LL_SOFTDEVICE_MULTIROLE=y
 CONFIG_CHIP_MALLOC_SYS_HEAP_SIZE=10240
 CONFIG_MPSL_WORK_STACK_SIZE=2048
 
-# 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
@@ -17,8 +17,6 @@ CONFIG_CHIP_NFC_COMMISSIONING=n
 CONFIG_CHIP_MALLOC_SYS_HEAP_SIZE=10240
 CONFIG_MPSL_WORK_STACK_SIZE=2048
 
-# 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
@@ -11,8 +11,6 @@ CONFIG_BT_LL_SOFTDEVICE_MULTIROLE=y
 CONFIG_CHIP_MALLOC_SYS_HEAP_SIZE=10240
 CONFIG_MPSL_WORK_STACK_SIZE=2048
 
-# 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
@@ -17,8 +17,6 @@ CONFIG_CHIP_NFC_COMMISSIONING=n
 CONFIG_CHIP_MALLOC_SYS_HEAP_SIZE=10240
 CONFIG_MPSL_WORK_STACK_SIZE=2048
 
-# 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
diff --git a/samples/matter/lock/boards/nrf54l15dk_nrf54l15_cpuapp.conf b/samples/matter/lock/boards/nrf54l15dk_nrf54l15_cpuapp.conf
diff --git a/samples/matter/lock/boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf b/samples/matter/lock/boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf
diff --git a/samples/matter/smoke_co_alarm/boards/nrf54l15dk_nrf54l10_cpuapp.conf b/samples/matter/smoke_co_alarm/boards/nrf54l15dk_nrf54l10_cpuapp.conf
diff --git a/samples/matter/smoke_co_alarm/boards/nrf54l15dk_nrf54l15_cpuapp.conf b/samples/matter/smoke_co_alarm/boards/nrf54l15dk_nrf54l15_cpuapp.conf
diff --git a/samples/matter/template/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/samples/matter/template/boards/nrf54h20dk_nrf54h20_cpuapp.conf
diff --git a/samples/matter/template/boards/nrf54l15dk_nrf54l10_cpuapp.conf b/samples/matter/template/boards/nrf54l15dk_nrf54l10_cpuapp.conf
diff --git a/samples/matter/template/boards/nrf54l15dk_nrf54l15_cpuapp.conf b/samples/matter/template/boards/nrf54l15dk_nrf54l15_cpuapp.conf
diff --git a/samples/matter/template/boards/nrf54l15dk_nrf54l15_cpuapp_internal.conf b/samples/matter/template/boards/nrf54l15dk_nrf54l15_cpuapp_internal.conf
diff --git a/samples/matter/template/boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf b/samples/matter/template/boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf
diff --git a/samples/matter/thermostat/boards/nrf54l15dk_nrf54l15_cpuapp.conf b/samples/matter/thermostat/boards/nrf54l15dk_nrf54l15_cpuapp.conf
diff --git a/samples/matter/thermostat/boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf b/samples/matter/thermostat/boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf
diff --git a/samples/matter/window_covering/boards/nrf54l15dk_nrf54l15_cpuapp.conf b/samples/matter/window_covering/boards/nrf54l15dk_nrf54l15_cpuapp.conf
diff --git a/samples/matter/window_covering/boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf b/samples/matter/window_covering/boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf
diff --git a/west.yml b/west.yml
