commit 7024340b6627ce19998d1beb19fc211d7d0e6a68
author Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no> Mon May 11 14:20:29 2020 +0200
committer David Brown <davidb@davidb.org> Fri May 15 15:11:56 2020 -0600
tree 5202e41783f896acdfafa66eb882f41b6a6edef4
parent 6e26e38585cc28ee2b22077740507546fe909dc9

zephyr: Change DT_FLASH_AREA_ macros to FLASH_AREA for multimage

Use the new FLASH_AREA_ macros.

Signed-off-by: Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no>

boot/zephyr/include/target.h

diff --git a/boot/zephyr/include/target.h b/boot/zephyr/include/target.h
index 3cff9f3..2e0f5fd 100644
--- a/boot/zephyr/include/target.h
+++ b/boot/zephyr/include/target.h
@@ -42,10 +42,8 @@
 #error "Target support is incomplete; cannot build mcuboot."
 #endif
 
-#if ((MCUBOOT_IMAGE_NUMBER == 2) && (!defined(FLASH_AREA_IMAGE_2_OFFSET) || \
-                                     !defined(FLASH_AREA_IMAGE_2_SIZE)   || \
-                                     !defined(FLASH_AREA_IMAGE_3_OFFSET) || \
-                                     !defined(FLASH_AREA_IMAGE_3_SIZE)))
+#if (MCUBOOT_IMAGE_NUMBER == 2) && (!(FLASH_AREA_LABEL_EXISTS(image_2)) || \
+                                     !(FLASH_AREA_LABEL_EXISTS(image_3)))
 #error "Target support is incomplete; cannot build mcuboot."
 #endif