manifest: Update sdk-zephyr revision and change some CONFIGs

NordicBuilder · rghaddab · commit fafc0ec73b74 · 2025-03-10T10:18:16.000+01:00
Some of the CONFIGs for ZMS and for its backend for Settings has been
added and others deleted.

Signed-off-by: Nordic Builder &lt;pylon@nordicsemi.no&gt;
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,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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
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/samples/openthread/cli/boards/nrf54l15dk_nrf54l15_cpuapp.conf b/samples/openthread/cli/boards/nrf54l15dk_nrf54l15_cpuapp.conf
diff --git a/samples/openthread/coprocessor/boards/nrf54l15dk_nrf54l15_cpuapp.conf b/samples/openthread/coprocessor/boards/nrf54l15dk_nrf54l15_cpuapp.conf
diff --git a/west.yml b/west.yml
