img_util: Use absolute address in active partition

Use absolute addresses while determining a running application
partition.

Signed-off-by: Tomasz Chyrowicz <[email protected]>

Author: tomchy

subsys/dfu/img_util/flash_img.c

@@ -23,9 +23,25 @@ LOG_MODULE_REGISTER(flash_img, CONFIG_IMG_MANAGER_LOG_LEVEL);
 #include <bootutil/bootutil_public.h>
 #endif
 
+#ifdef CONFIG_USE_DT_CODE_PARTITION
+#define FIXED_PARTITION_ADDRESS(label)                                                             \
+	(DT_REG_ADDR(DT_NODELABEL(label)) +                                                        \
+	 DT_REG_ADDR(COND_CODE_1(DT_FIXED_SUBPARTITION_EXISTS(DT_NODELABEL(label)),                \
+			(DT_GPARENT(DT_PARENT(DT_NODELABEL(label)))),                              \
+			(DT_GPARENT(DT_NODELABEL(label))))))
+#define FLASH_LOAD_ADDRESS                                                                         \
+	(DT_REG_ADDR(DT_CHOSEN(zephyr_code_partition)) +                                           \
+	 DT_REG_ADDR(COND_CODE_1(DT_FIXED_SUBPARTITION_EXISTS(DT_CHOSEN(zephyr_code_partition)),   \
+			(DT_GPARENT(DT_PARENT(DT_CHOSEN(zephyr_code_partition)))),                 \
+			(DT_GPARENT(DT_CHOSEN(zephyr_code_partition))))))
+#define FIXED_PARTITION_IS_RUNNING_APP_PARTITION(label)                                            \
+	(FIXED_PARTITION_ADDRESS(label) <= FLASH_LOAD_ADDRESS &&                                   \
+	 FIXED_PARTITION_ADDRESS(label) + DT_REG_SIZE(DT_NODELABEL(label)) > FLASH_LOAD_ADDRESS)
+#else
 #define FIXED_PARTITION_IS_RUNNING_APP_PARTITION(label)                                            \
 	(FIXED_PARTITION_OFFSET(label) <= CONFIG_FLASH_LOAD_OFFSET &&                              \
 	 FIXED_PARTITION_OFFSET(label) + FIXED_PARTITION_SIZE(label) > CONFIG_FLASH_LOAD_OFFSET)
+#endif
 
 #include <zephyr/devicetree.h>
 #if defined(CONFIG_TRUSTED_EXECUTION_NONSECURE) && (CONFIG_TFM_MCUBOOT_IMAGE_NUMBER == 2)

tests/subsys/dfu/img_util/src/main.c

@@ -12,9 +12,25 @@
 #define SLOT0_PARTITION		slot0_partition
 #define SLOT1_PARTITION		slot1_partition
 
+#ifdef CONFIG_USE_DT_CODE_PARTITION
+#define FIXED_PARTITION_ADDRESS(label)                                                             \
+	(DT_REG_ADDR(DT_NODELABEL(label)) +                                                        \
+	 DT_REG_ADDR(COND_CODE_1(DT_FIXED_SUBPARTITION_EXISTS(DT_NODELABEL(label)),                \
+			(DT_GPARENT(DT_PARENT(DT_NODELABEL(label)))),                              \
+			(DT_GPARENT(DT_NODELABEL(label))))))
+#define FLASH_LOAD_ADDRESS                                                                         \
+	(DT_REG_ADDR(DT_CHOSEN(zephyr_code_partition)) +                                           \
+	 DT_REG_ADDR(COND_CODE_1(DT_FIXED_SUBPARTITION_EXISTS(DT_CHOSEN(zephyr_code_partition)),   \
+			(DT_GPARENT(DT_PARENT(DT_CHOSEN(zephyr_code_partition)))),                 \
+			(DT_GPARENT(DT_CHOSEN(zephyr_code_partition))))))
+#define FIXED_PARTITION_IS_RUNNING_APP_PARTITION(label)                                            \
+	(FIXED_PARTITION_ADDRESS(label) <= FLASH_LOAD_ADDRESS &&                                   \
+	 FIXED_PARTITION_ADDRESS(label) + DT_REG_SIZE(DT_NODELABEL(label)) > FLASH_LOAD_ADDRESS)
+#else
 #define FIXED_PARTITION_IS_RUNNING_APP_PARTITION(label)                                            \
 	(FIXED_PARTITION_OFFSET(label) <= CONFIG_FLASH_LOAD_OFFSET &&                              \
 	 FIXED_PARTITION_OFFSET(label) + FIXED_PARTITION_SIZE(label) > CONFIG_FLASH_LOAD_OFFSET)
+#endif
 
 #if FIXED_PARTITION_IS_RUNNING_APP_PARTITION(slot0_partition)
 #define UPLOAD_PARTITION_ID	FIXED_PARTITION_ID(SLOT1_PARTITION)