manifest: Update sdk-zephyr

Includes the new zephyr,mapped-binding and conversion of Nordic
parts to use this new compatible. Also included is an update to
the flash map PM file to support the new macros

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>

Author: nordicjm

include/flash_map_pm.h

@@ -50,40 +50,50 @@
 #define FLASH_AREA_LABEL_STR(label) #label
 
 #define FIXED_PARTITION_ID(label) PM_ID(label)
+#define PARTITION_ID(label) FIXED_PARTITION_ID(label)
 #define FLASH_AREA_ID(label) FIXED_PARTITION_ID(label)
 
 #define FIXED_PARTITION_DATA_FIELD(label, x) \
 	UTIL_CAT(PM_, UTIL_CAT(UTIL_CAT(PM_, UTIL_CAT(PM_ID(label), _LABEL)), x))
+#define PARTITION_DATA_FIELD(label, x) FIXED_PARTITION_DATA_FIELD(label, x)
 #define FLASH_DATA_FIELD(label, x) FIXED_PARTITION_DATA_FIELD(label, x)
 
 #define FIXED_PARTITION_OFFSET(label) FIXED_PARTITION_DATA_FIELD(label, _OFFSET)
+#define PARTITION_OFFSET(label) FIXED_PARTITION_OFFSET(label)
 #define FLASH_AREA_OFFSET(label) FIXED_PARTITION_OFFSET(label)
 
 #define FIXED_PARTITION_SIZE(label) FIXED_PARTITION_DATA_FIELD(label, _SIZE)
+#define PARTITION_SIZE(label) FIXED_PARTITION_SIZE(label)
 #define FLASH_AREA_SIZE(label) FIXED_PARTITION_SIZE(label)
 
 #define FIXED_PARTITION_DEVICE(label) \
 	COND_CODE_1(DT_NODE_EXISTS(FIXED_PARTITION_DATA_FIELD(label, _DEV)), \
 		    (DEVICE_DT_GET_OR_NULL(FIXED_PARTITION_DATA_FIELD(label, _DEV))), \
 		    (DEVICE_DT_GET_OR_NULL(DT_NODELABEL(FIXED_PARTITION_DATA_FIELD(label, _DEV)))))
+#define PARTITION_DEVICE(label) FIXED_PARTITION_DEVICE(label)
 #define FLASH_AREA_DEVICE(label) FIXED_PARTITION_DEVICE(label)
 
 #define FIXED_PARTITION_MTD(label) \
 	COND_CODE_1(DT_NODE_EXISTS(FIXED_PARTITION_DATA_FIELD(label, _DEV)), \
 		    (FIXED_PARTITION_DATA_FIELD(label, _DEV)), \
 		    (DT_NODELABEL(FIXED_PARTITION_DATA_FIELD(label, _DEV))))
+#define PARTITION_MTD(label) FIXED_PARTITION_MTD(label)
 #define FIXED_PARTITION_NODE_MTD(node) \
 	COND_CODE_1( \
 		DT_FIXED_SUBPARTITION_EXISTS(node), \
 			(DT_MTD_FROM_FIXED_SUBPARTITION(node)), \
 			(DT_MTD_FROM_FIXED_PARTITION(node)))
+#define PARTITION_NODE_MTD(node) FIXED_PARTITION_NODE_MTD(node)
 
 #define FIXED_PARTITION_EXISTS(label) IS_ENABLED(PM_IS_ENABLED(label))
+#define PARTITION_EXISTS(label) FIXED_PARTITION_EXISTS(label)
 #define FLASH_AREA_LABEL_EXISTS(label) FIXED_PARTITION_EXISTS(label)
 #define FIXED_PARTITION_ADDRESS(label) FIXED_PARTITION_DATA_FIELD(label, _ADDRESS)
+#define PARTITION_ADDRESS(label) FIXED_PARTITION_ADDRESS(label)
 
 #define FIXED_PARTITION(label)							\
 	((const struct flash_area *)&UTIL_CAT(global_pm_partition_, label))
+#define PARTITION(label) FIXED_PARTITION(label)
 
 #define DECLARE_PARTITION(label)						\
 	extern const struct flash_area UTIL_CAT(global_pm_partition_, label)

west.yml

@@ -65,7 +65,7 @@ manifest:
     # https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html
     - name: zephyr
       repo-path: sdk-zephyr
-      revision: adaa514f58593090bf23cf204da95d28f1aa4602
+      revision: pull/3880/head
       import:
         # In addition to the zephyr repository itself, NCS also
         # imports the contents of zephyr/west.yml at the above