commit 7afb334805ed82b1b761c27b3c7b86449a098554
author Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no> Thu Jun 18 14:48:58 2020 +0200
committer Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no> Thu Jun 18 14:48:58 2020 +0200
tree e8456e9446af166eafbc45a933a9ac990482dd22
parent f5a04841358e6b989d72187d2ef17fb569a9c0b7

Revert "zephyr: Change DT_FLASH_AREA_ macros to FLASH_AREA for multimage"

This reverts commit 7024340b6627ce19998d1beb19fc211d7d0e6a68.

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 7c86ff3..e71bfb5 100644
--- a/boot/zephyr/include/target.h
+++ b/boot/zephyr/include/target.h
@@ -38,8 +38,10 @@
 #error "Target support is incomplete; cannot build mcuboot."
 #endif
 
-#if (MCUBOOT_IMAGE_NUMBER == 2) && (!(FLASH_AREA_LABEL_EXISTS(image_2)) || \
-                                     !(FLASH_AREA_LABEL_EXISTS(image_3)))
+#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)))
 #error "Target support is incomplete; cannot build mcuboot."
 #endif