commit 9a5b95158e48c84d4624ecbd61da31fbc96be036
author Kumar Gala <kumar.gala@linaro.org> Wed Apr 08 12:06:21 2020 -0500
committer David Brown <davidb@davidb.org> Mon May 04 13:34:11 2020 -0600
tree da6af232bf211b95e036b4553ab7182fa91f8a96
parent 32b61f333b3e743f22a6813d601e552e12737065

zephyr: convert DT_JEDEC_SPI_NOR_0_LABEL to new dt macros

As the DT define DT_JEDEC_SPI_NOR_0_LABEL is intended to be deprecated
move to the new macro style to determine for DT_JEDEC_SPI_NOR_0_LABEL

Signed-off-by: Kumar Gala <kumar.gala@linaro.org>

boot/zephyr/include/target.h

diff --git a/boot/zephyr/include/target.h b/boot/zephyr/include/target.h
index 794f40f..d6f5b74 100644
--- a/boot/zephyr/include/target.h
+++ b/boot/zephyr/include/target.h
@@ -25,11 +25,15 @@
 
 #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(DT_JEDEC_SPI_NOR_0_LABEL)) || \
+    (defined(CONFIG_XTENSA) && !defined(JEDEC_SPI_NOR_0_LABEL)) || \
     !defined(FLASH_ALIGN) ||                  \
     !defined(DT_FLASH_AREA_IMAGE_0_OFFSET) || \
     !defined(DT_FLASH_AREA_IMAGE_0_SIZE) || \

boot/zephyr/main.c

diff --git a/boot/zephyr/main.c b/boot/zephyr/main.c
index ce62851..c3e4cfe 100644
--- a/boot/zephyr/main.c
+++ b/boot/zephyr/main.c
@@ -284,9 +284,9 @@
         while (1)
             ;
     }
-#elif (defined(CONFIG_XTENSA) && defined(DT_JEDEC_SPI_NOR_0_LABEL))
-    if (!flash_device_get_binding(DT_JEDEC_SPI_NOR_0_LABEL)) {
-        BOOT_LOG_ERR("Flash device %s not found", DT_JEDEC_SPI_NOR_0_LABEL);
+#elif (defined(CONFIG_XTENSA) && defined(JEDEC_SPI_NOR_0_LABEL))
+    if (!flash_device_get_binding(JEDEC_SPI_NOR_0_LABEL)) {
+        BOOT_LOG_ERR("Flash device %s not found", JEDEC_SPI_NOR_0_LABEL);
         while (1)
             ;
     }