tree: Update sdk-zephyr,sdk-mcuboot and partition macro usage

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

applications/nrf_desktop/src/modules/dfu.c

@@ -130,18 +130,18 @@ LOG_MODULE_REGISTER(MODULE, CONFIG_DESKTOP_CONFIG_CHANNEL_DFU_LOG_LEVEL);
 		#define MCUBOOT_PRIMARY_NODE   DT_NODELABEL(slot0_partition)
 		#define MCUBOOT_SECONDARY_NODE DT_NODELABEL(slot1_partition)
 
-		BUILD_ASSERT(UTIL_OR(DT_FIXED_PARTITION_EXISTS(MCUBOOT_PRIMARY_NODE),
+		BUILD_ASSERT(UTIL_OR(DT_PARTITION_EXISTS(MCUBOOT_PRIMARY_NODE),
 			     DT_FIXED_SUBPARTITION_EXISTS(MCUBOOT_PRIMARY_NODE)),
 			     "Missing primary partition definition in DTS.");
-		BUILD_ASSERT(UTIL_OR(DT_FIXED_PARTITION_EXISTS(MCUBOOT_SECONDARY_NODE),
+		BUILD_ASSERT(UTIL_OR(DT_PARTITION_EXISTS(MCUBOOT_SECONDARY_NODE),
 			     DT_FIXED_SUBPARTITION_EXISTS(MCUBOOT_SECONDARY_NODE)),
 			     "Missing secondary partition definition in DTS.");
 
 
 		#define NVM_ADDRESS(node) \
 			(COND_CODE_1(DT_FIXED_SUBPARTITION_EXISTS(node), \
 				(DT_FIXED_SUBPARTITION_ADDR(node)), \
-				(DT_FIXED_PARTITION_ADDR(node))))
+				(DT_PARTITION_ADDR(node))))
 		#define CODE_PARTITION_START_ADDR    NVM_ADDRESS(CODE_PARTITION_NODE)
 		#define MCUBOOT_PRIMARY_START_ADDR   NVM_ADDRESS(MCUBOOT_PRIMARY_NODE)
 		#define MCUBOOT_SECONDARY_START_ADDR NVM_ADDRESS(MCUBOOT_SECONDARY_NODE)
@@ -154,8 +154,8 @@ LOG_MODULE_REGISTER(MODULE, CONFIG_DESKTOP_CONFIG_CHANNEL_DFU_LOG_LEVEL);
 			#error Primary and secondary partitions cannot have the same address.
 		#endif
 
-		#define MCUBOOT_PRIMARY_SLOT_ID   DT_FIXED_PARTITION_ID(MCUBOOT_PRIMARY_NODE)
-		#define MCUBOOT_SECONDARY_SLOT_ID DT_FIXED_PARTITION_ID(MCUBOOT_SECONDARY_NODE)
+		#define MCUBOOT_PRIMARY_SLOT_ID   DT_PARTITION_ID(MCUBOOT_PRIMARY_NODE)
+		#define MCUBOOT_SECONDARY_SLOT_ID DT_PARTITION_ID(MCUBOOT_SECONDARY_NODE)
 
 		#if BUILD_TIME_DFU_SLOT_ID_INFO_IS_AVAILABLE
 			/* Use range check to allow for placing MCUboot header in a separate

applications/nrf_desktop/src/modules/failsafe.c

@@ -38,11 +38,11 @@ static int failsafe_check(bool *failure_detected)
 static int failsafe_erase(void)
 {
 	const struct flash_area *flash_area;
-	int err = flash_area_open(FIXED_PARTITION_ID(storage_partition),
+	int err = flash_area_open(PARTITION_ID(storage_partition),
 				  &flash_area);
 	if (!err) {
 		err = flash_area_erase(flash_area, 0,
-				       FIXED_PARTITION_SIZE(storage_partition));
+				       PARTITION_SIZE(storage_partition));
 		flash_area_close(flash_area);
 	}
 

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)

lib/fprotect/sys_init_fprotect.c

@@ -16,8 +16,8 @@
 #define AREA_SIZE PM_SIZE
 #else
 #define CODE_PARTITION DT_CHOSEN(zephyr_code_partition)
-#define AREA_ADDRESS FIXED_PARTITION_NODE_OFFSET(CODE_PARTITION)
-#define AREA_SIZE FIXED_PARTITION_NODE_SIZE(CODE_PARTITION)
+#define AREA_ADDRESS PARTITION_NODE_OFFSET(CODE_PARTITION)
+#define AREA_SIZE PARTITION_NODE_SIZE(CODE_PARTITION)
 #endif
 
 #define PRIORITY_LEVEL 0 /* Locking should be performed as soon as possible */

lib/hw_unique_key/hw_unique_key_cc3xx_acl.c

@@ -29,7 +29,7 @@ static const uint32_t huk_magic[4] = {
 #ifdef CONFIG_PARTITION_MANAGER_ENABLED
 static uint32_t huk_addr = PM_HW_UNIQUE_KEY_PARTITION_ADDRESS;
 #else
-static uint32_t huk_addr = FIXED_PARTITION_ADDRESS(hw_unique_key_partition);
+static uint32_t huk_addr = PARTITION_ADDRESS(hw_unique_key_partition);
 #endif
 
 int hw_unique_key_write(enum hw_unique_key_slot key_slot, const uint8_t *key)

lib/nrf_modem_lib/trace_backends/flash/flash.c

@@ -221,7 +221,7 @@ int trace_backend_init(trace_backend_processed_cb trace_processed_cb)
 
 	trace_processed_callback = trace_processed_cb;
 
-	err = flash_area_open(FIXED_PARTITION_ID(MODEM_TRACE_PARTITION), &modem_trace_area);
+	err = flash_area_open(PARTITION_ID(MODEM_TRACE_PARTITION), &modem_trace_area);
 	if (err) {
 		LOG_ERR("flash_area_open error:  %d", err);
 		return -ENODEV;
@@ -258,7 +258,7 @@ int trace_backend_init(trace_backend_processed_cb trace_processed_cb)
 	uint32_t f_sector_cnt = sizeof(trace_flash_sectors) / sizeof(struct flash_sector);
 
 	err = flash_area_get_sectors(
-		FIXED_PARTITION_ID(MODEM_TRACE_PARTITION), &f_sector_cnt, trace_flash_sectors);
+		PARTITION_ID(MODEM_TRACE_PARTITION), &f_sector_cnt, trace_flash_sectors);
 	if (err) {
 		LOG_ERR("flash_area_get_sectors error: %d", err);
 
@@ -275,7 +275,7 @@ int trace_backend_init(trace_backend_processed_cb trace_processed_cb)
 	LOG_DBG("Sectors: %d, first sector: %p, sector size: %d",
 		f_sector_cnt, trace_flash_sectors, trace_flash_sectors[0].fs_size);
 
-	err = fcb_init(FIXED_PARTITION_ID(MODEM_TRACE_PARTITION), &trace_fcb);
+	err = fcb_init(PARTITION_ID(MODEM_TRACE_PARTITION), &trace_fcb);
 	if (err) {
 		LOG_ERR("fcb_init error: %d", err);
 		return err;

modules/memfault-firmware-sdk/memfault_flash_coredump_storage.c

@@ -30,7 +30,7 @@ static bool last_coredump_cleared;
 void memfault_platform_coredump_storage_get_info(sMfltCoredumpStorageInfo *info)
 {
 	*info = (sMfltCoredumpStorageInfo) {
-		.size = FIXED_PARTITION_SIZE(MEMFAULT_STORAGE),
+		.size = PARTITION_SIZE(MEMFAULT_STORAGE),
 	};
 }
 
@@ -53,7 +53,7 @@ bool memfault_platform_coredump_storage_read(uint32_t offset, void *data, size_t
 	}
 
 	/* Note: internal flash is memory mapped so we can just memcpy it out */
-	const uint32_t address = FIXED_PARTITION_OFFSET(MEMFAULT_STORAGE) + offset;
+	const uint32_t address = PARTITION_OFFSET(MEMFAULT_STORAGE) + offset;
 
 	memcpy(data, (void *)address, read_len);
 	return true;
@@ -75,7 +75,7 @@ bool memfault_platform_coredump_storage_erase(uint32_t offset, size_t erase_size
 	}
 
 	for (size_t page = offset; page < erase_size; page += page_size) {
-		const uint32_t address = FIXED_PARTITION_OFFSET(MEMFAULT_STORAGE) + page;
+		const uint32_t address = PARTITION_OFFSET(MEMFAULT_STORAGE) + page;
 
 		nrfx_nvmc_page_erase(address);
 	}
@@ -88,7 +88,7 @@ bool memfault_platform_coredump_storage_erase(uint32_t offset, size_t erase_size
  */
 bool memfault_platform_coredump_storage_buffered_write(sCoredumpWorkingBuffer *blk)
 {
-	const uint32_t start_addr = FIXED_PARTITION_OFFSET(MEMFAULT_STORAGE);
+	const uint32_t start_addr = PARTITION_OFFSET(MEMFAULT_STORAGE);
 	const uint32_t addr = start_addr + blk->write_offset;
 
 	if (!prv_op_within_flash_bounds(blk->write_offset, MEMFAULT_COREDUMP_STORAGE_WRITE_SIZE)) {
@@ -122,7 +122,7 @@ void memfault_platform_coredump_storage_clear(void)
 	const struct flash_area *flash_area;
 	int err;
 
-	err = flash_area_open(FIXED_PARTITION_ID(MEMFAULT_STORAGE), &flash_area);
+	err = flash_area_open(PARTITION_ID(MEMFAULT_STORAGE), &flash_area);
 	if (err) {
 		MEMFAULT_LOG_ERROR("Unable to open coredump storage: 0x%x", err);
 		return;

samples/bluetooth/mesh/dfu/common/src/dfu_target.c

@@ -133,8 +133,8 @@ static int dfu_meta_check(struct bt_mesh_dfu_srv *srv,
 		return -EINVAL;
 	}
 
-	if (flash_area_size_get(FIXED_PARTITION_ID(slot0_partition)) < metadata.fw_size ||
-	    flash_area_size_get(FIXED_PARTITION_ID(slot1_partition)) < metadata.fw_size) {
+	if (flash_area_size_get(PARTITION_ID(slot0_partition)) < metadata.fw_size ||
+	    flash_area_size_get(PARTITION_ID(slot1_partition)) < metadata.fw_size) {
 		printk("New firmware won't fit into flash.");
 		return -EINVAL;
 	}
@@ -251,7 +251,7 @@ static void image_version_load(void)
 	struct mcuboot_img_header img_header;
 	int err;
 
-	err = boot_read_bank_header(FIXED_PARTITION_ID(slot0_partition), &img_header,
+	err = boot_read_bank_header(PARTITION_ID(slot0_partition), &img_header,
 				    sizeof(img_header));
 	if (err) {
 		printk("Failed to read image header: %d\n", err);

samples/bluetooth/mesh/dfu/distributor/src/main.c

@@ -147,7 +147,7 @@ int main(void)
 
 	printk("Initializing...\n");
 
-	err = bt_mesh_blob_io_flash_init(&blob_flash_stream, FIXED_PARTITION_ID(slot1_partition),
+	err = bt_mesh_blob_io_flash_init(&blob_flash_stream, PARTITION_ID(slot1_partition),
 					 0);
 	if (err) {
 		printk("Failed to init BLOB IO Flash module: %d\n", err);

samples/bluetooth/mesh/dfu/target/src/main.c

@@ -138,7 +138,7 @@ int main(void)
 
 	printk("Initializing...\n");
 
-	err = bt_mesh_blob_io_flash_init(&blob_flash_stream, FIXED_PARTITION_ID(slot1_partition),
+	err = bt_mesh_blob_io_flash_init(&blob_flash_stream, PARTITION_ID(slot1_partition),
 					 0);
 	if (err) {
 		printk("Failed to init BLOB IO Flash module: %d\n", err);