manifest: sdk-find-my: Update revision

include/flash_map_pm.h

@@ -29,7 +29,8 @@
 #define image_scratch mcuboot_scratch
 #define image_scratch mcuboot_scratch
 
-#if (CONFIG_SETTINGS_FCB || CONFIG_SETTINGS_NVS || defined(PM_SETTINGS_STORAGE_ID))
+#if (CONFIG_SETTINGS_FCB || CONFIG_SETTINGS_NVS || defined(PM_SETTINGS_STORAGE_ID) ||\
+	CONFIG_SETTINGS_ZMS)
 #define storage settings_storage
 #define storage_partition settings_storage
 #elif CONFIG_FILE_SYSTEM_LITTLEFS
@@ -38,6 +39,9 @@
 #elif CONFIG_NVS
 #define storage nvs_storage
 #define storage_partition nvs_storage
+#elif CONFIG_ZMS
+#define storage zms_storage
+#define storage_partition zms_storage
 #endif
 
 #define PM_ID(label) PM_##label##_ID

subsys/partition_manager/CMakeLists.txt

@@ -60,7 +60,7 @@ if (CONFIG_BOARD_HAS_NRF5_BOOTLOADER)
   ncs_add_partition_manager_config(pm.yml.nrf5_mbr)
 endif()
 
-if (CONFIG_SETTINGS_FCB OR CONFIG_SETTINGS_NVS)
+if (CONFIG_SETTINGS_FCB OR CONFIG_SETTINGS_NVS OR CONFIG_SETTINGS_ZMS)
   ncs_add_partition_manager_config(pm.yml.settings)
 endif()
 
@@ -76,6 +76,10 @@ if (CONFIG_NVS AND NOT CONFIG_SETTINGS_NVS)
   ncs_add_partition_manager_config(pm.yml.nvs)
 endif()
 
+if (CONFIG_ZMS AND NOT CONFIG_SETTINGS_ZMS)
+  ncs_add_partition_manager_config(pm.yml.zms)
+endif()
+
 if (CONFIG_NRF_MODEM_LIB)
   ncs_add_partition_manager_config(pm.yml.libmodem)
 endif()

subsys/partition_manager/Kconfig

@@ -72,7 +72,7 @@ rsource "Kconfig.template.partition_region"
 endif
 
 
-if SETTINGS_FCB || SETTINGS_NVS
+if SETTINGS_FCB || SETTINGS_NVS || SETTINGS_ZMS
 partition=SETTINGS_STORAGE
 partition-size=0x2000
 rsource "Kconfig.template.partition_config"
@@ -94,6 +94,13 @@ rsource "Kconfig.template.partition_config"
 rsource "Kconfig.template.partition_region"
 endif
 
+if ZMS && !SETTINGS_ZMS
+partition=ZMS_STORAGE
+partition-size=0x6000
+rsource "Kconfig.template.partition_config"
+rsource "Kconfig.template.partition_region"
+endif
+
 if ZIGBEE && !SOC_NRF52833
 partition=ZBOSS_NVRAM
 partition-size=0x8000

subsys/partition_manager/pm.yml.zms

@@ -0,0 +1,33 @@
+#include <autoconf.h>
+
+# In nRF54L15 we place the TF-M non-secure storage partitions after the
+# TF-M non-secure application to avoid splitting the secure/non-secure
+# partitions more than necessary.
+#if defined(CONFIG_SOC_NRF54L15_ENGA_CPUAPP) || defined(CONFIG_SOC_NRF54L15_CPUAPP)
+zms_storage:
+  placement:
+    after: [app]
+    before: [end]
+#ifdef CONFIG_PM_PARTITION_REGION_ZMS_STORAGE_EXTERNAL
+  region: external_flash
+#else
+  inside: [nonsecure_storage]
+#endif
+  size: CONFIG_PM_PARTITION_SIZE_ZMS_STORAGE
+
+
+#else
+zms_storage:
+  placement:
+    before: [tfm_storage, end]
+#ifdef CONFIG_PM_PARTITION_REGION_ZMS_STORAGE_EXTERNAL
+  region: external_flash
+#else
+#ifdef CONFIG_BUILD_WITH_TFM
+    align: {start: CONFIG_NRF_TRUSTZONE_FLASH_REGION_SIZE}
+#endif
+  inside: [nonsecure_storage]
+#endif
+  size: CONFIG_PM_PARTITION_SIZE_ZMS_STORAGE
+
+#endif /* (CONFIG_SOC_NRF54L15_ENGA_CPUAPP || CONFIG_SOC_NRF54L15_CPUAPP) */

subsys/trusted_storage/Kconfig

@@ -158,9 +158,9 @@ choice TRUSTED_STORAGE_STORAGE_BACKEND
 
 config TRUSTED_STORAGE_STORAGE_BACKEND_SETTINGS
 	bool "Settings storage backend"
-	depends on SETTINGS_NVS
+	depends on SETTINGS_NVS || SETTINGS_ZMS
 	help
-	  Use the Settings subsystem with NVS to store the assets
+	  Use the Settings subsystem to store the assets
 
 config TRUSTED_STORAGE_STORAGE_BACKEND_CUSTOM
 	bool "Custom storage backend"

west.yml

@@ -72,7 +72,7 @@ manifest:
     # https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html
     - name: zephyr
       repo-path: sdk-zephyr
-      revision: 8005d4e87b9bcba25f441a51f4f5d29b541022b9
+      revision: pull/2045/head
       import:
         # In addition to the zephyr repository itself, NCS also
         # imports the contents of zephyr/west.yml at the above
@@ -223,7 +223,7 @@ manifest:
         - sidewalk
     - name: find-my
       repo-path: sdk-find-my
-      revision: 71a5358138fc6aaffac8ff9b478f693b919bd53b
+      revision: pull/226/head
       groups:
         - find-my
     - name: azure-sdk-for-c