commit 402f1d00961477465ac89997b0f08452b7647a1d
author Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no> Tue May 05 15:53:54 2020 +0200
committer Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no> Thu Jun 18 14:35:52 2020 +0200
tree 9cbeb9c7fbaad77ce29280237d8d944d1f714ddc
parent 45216760fd996fa0fe031c2f9d1146ab256386c5

Revert "zephyr: convert DT_JEDEC_SPI_NOR_0_LABEL to new dt macros"

This reverts commit 9a5b95158e48c84d4624ecbd61da31fbc96be036.

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 2e0f5fd..c14151c 100644
--- a/boot/zephyr/include/target.h
+++ b/boot/zephyr/include/target.h
@@ -26,15 +26,11 @@
 
 #endif /* !defined(MCUBOOT_TARGET_CONFIG) */
 
-#if DT_NODE_HAS_PROP(DT_INST(0, jedec_spi_nor), label)
-#define JEDEC_SPI_NOR_0_LABEL DT_LABEL(DT_INST(0, jedec_spi_nor))
-#endif
-
 /*
  * Sanity check the target support.
  */
 #if (!defined(CONFIG_XTENSA) && !defined(DT_CHOSEN_ZEPHYR_FLASH_CONTROLLER_LABEL)) || \
-    (defined(CONFIG_XTENSA) && !defined(JEDEC_SPI_NOR_0_LABEL)) || \
+    (defined(CONFIG_XTENSA) && !defined(DT_JEDEC_SPI_NOR_0_LABEL)) || \
     !defined(FLASH_ALIGN) ||                  \
     !(FLASH_AREA_LABEL_EXISTS(image_0)) || \
     !(FLASH_AREA_LABEL_EXISTS(image_1)) || \