[nrf fromlist] dfu: img_util: Fix partition detection

Fixes the logic in detecting which partition is being executed
from, also fixes a test for this feature

Upstream PR #: 106189

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

Author: nordicjm

subsys/dfu/img_util/flash_img.c

@@ -23,17 +23,8 @@ LOG_MODULE_REGISTER(flash_img, CONFIG_IMG_MANAGER_LOG_LEVEL);
 #include <bootutil/bootutil_public.h>
 #endif
 
-#if defined(CONFIG_FLASH_USES_MAPPED_PARTITION)
 #define PARTITION_IS_RUNNING_APP_PARTITION(label) \
 	DT_SAME_NODE(DT_CHOSEN(zephyr_code_partition), DT_NODELABEL(label))
-#else
-#define PARTITION_IS_RUNNING_APP_PARTITION(label)                                            \
-	DT_SAME_NODE(PARTITION_NODE_MTD(DT_CHOSEN(zephyr_code_partition)),                   \
-		PARTITION_MTD(label)) && (PARTITION_ADDRESS(label) <=                  \
-				(CONFIG_FLASH_BASE_ADDRESS + CONFIG_FLASH_LOAD_OFFSET) &&          \
-			PARTITION_ADDRESS(label) + PARTITION_SIZE(label) >             \
-				(CONFIG_FLASH_BASE_ADDRESS + CONFIG_FLASH_LOAD_OFFSET))
-#endif
 
 #if defined(CONFIG_TRUSTED_EXECUTION_NONSECURE) && (CONFIG_TFM_MCUBOOT_IMAGE_NUMBER == 2)
 #define UPLOAD_FLASH_AREA_LABEL slot1_ns_partition

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

@@ -13,11 +13,8 @@
 #define SLOT0_PARTITION		slot0_partition
 #define SLOT1_PARTITION		slot1_partition
 
-#define PARTITION_IS_RUNNING_APP_PARTITION(label)                                            \
-	DT_SAME_NODE(PARTITION_NODE_MTD(DT_CHOSEN(zephyr_code_partition)),                   \
-		PARTITION_MTD(label)) &&                                                     \
-	(PARTITION_OFFSET(label) <= CONFIG_FLASH_LOAD_OFFSET &&                              \
-	 PARTITION_OFFSET(label) + PARTITION_SIZE(label) > CONFIG_FLASH_LOAD_OFFSET)
+#define PARTITION_IS_RUNNING_APP_PARTITION(label)				\
+	DT_SAME_NODE(DT_CHOSEN(zephyr_code_partition), DT_NODELABEL(label))
 
 #if PARTITION_IS_RUNNING_APP_PARTITION(slot0_partition)
 #define UPLOAD_PARTITION_ID	PARTITION_ID(SLOT1_PARTITION)