From 21cd8dfba4fad674da1af1795f1e416dc5eb3690 Mon Sep 17 00:00:00 2001 From: Nordic Builder Date: Tue, 24 Sep 2024 15:27:22 +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 bf82c9f600f..5540cf24f5c 100644 --- a/west.yml +++ b/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: 4322f5169f4c0f24e3712de061a2fec5a29098a7 + revision: pull/2045/head import: # In addition to the zephyr repository itself, NCS also # imports the contents of zephyr/west.yml at the above From 88e306e06321ed867703a5be33211c46262aaf73 Mon Sep 17 00:00:00 2001 From: Riadh Ghaddab Date: Thu, 26 Sep 2024 12:22:12 +0200 Subject: [PATCH 2/2] flash_map_pm: add support for ZMS storage This adds the support of ZMS for the partition manager Signed-off-by: Riadh Ghaddab --- include/flash_map_pm.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/include/flash_map_pm.h b/include/flash_map_pm.h index 4232f646ccf..baa5cfdb747 100644 --- a/include/flash_map_pm.h +++ b/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