commit 24321c3926c19f3699838606f46b91f7f6c91e31
author Rajavardhan Gundi <rajavardhan.gundi@intel.com> Fri Feb 08 12:48:34 2019 +0530
committer David Brown <davidb@davidb.org> Tue Feb 19 11:52:31 2019 -0700
tree 16a16eb3a762a9abb359a5f353fd6311f2a0707e
parent 4df602aeab4ba6b254369bdd07f1277b38021fd7

Replace DT_SPI_NOR_DRV_NAME with DT_JEDEC_SPI_NOR_0_LABEL

Zephyr mainline now generates DT_JEDEC_SPI_NOR_0_LABEL instead of
DT_SPI_NOR_DRV_NAME.

Signed-off-by: Rajavardhan Gundi <rajavardhan.gundi@intel.com>
Signed-off-by: Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no>

boot/zephyr/flash_map_extended.c

diff --git a/boot/zephyr/flash_map_extended.c b/boot/zephyr/flash_map_extended.c
index 0b56eeb..0c3d428 100644
--- a/boot/zephyr/flash_map_extended.c
+++ b/boot/zephyr/flash_map_extended.c
@@ -20,7 +20,7 @@
 #if (!defined(CONFIG_XTENSA) && defined(DT_FLASH_DEV_NAME))
 #define FLASH_DEVICE_ID SOC_FLASH_0_ID
 #define FLASH_DEVICE_BASE CONFIG_FLASH_BASE_ADDRESS
-#elif (defined(CONFIG_XTENSA) && defined(DT_SPI_NOR_DRV_NAME))
+#elif (defined(CONFIG_XTENSA) && defined(DT_JEDEC_SPI_NOR_0_LABEL))
 #define FLASH_DEVICE_ID SPI_FLASH_0_ID
 #define FLASH_DEVICE_BASE 0
 #else

boot/zephyr/include/target.h

diff --git a/boot/zephyr/include/target.h b/boot/zephyr/include/target.h
index 8fa11d4..6e777fb 100644
--- a/boot/zephyr/include/target.h
+++ b/boot/zephyr/include/target.h
@@ -34,7 +34,7 @@
  * Sanity check the target support.
  */
 #if (!defined(CONFIG_XTENSA) && !defined(DT_FLASH_DEV_NAME)) || \
-    (defined(CONFIG_XTENSA) && !defined(DT_SPI_NOR_DRV_NAME)) || \
+    (defined(CONFIG_XTENSA) && !defined(DT_JEDEC_SPI_NOR_0_LABEL)) || \
     !defined(FLASH_ALIGN) ||                  \
     !defined(FLASH_AREA_IMAGE_0_OFFSET) || \
     !defined(FLASH_AREA_IMAGE_0_SIZE) || \

boot/zephyr/main.c

diff --git a/boot/zephyr/main.c b/boot/zephyr/main.c
index f4bc4ab..236f80c 100644
--- a/boot/zephyr/main.c
+++ b/boot/zephyr/main.c
@@ -164,9 +164,9 @@
         while (1)
             ;
     }
-#elif (defined(CONFIG_XTENSA) && defined(DT_SPI_NOR_DRV_NAME))
-    if (!flash_device_get_binding(DT_SPI_NOR_DRV_NAME)) {
-        BOOT_LOG_ERR("Flash device %s not found", DT_SPI_NOR_DRV_NAME);
+#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);
         while (1)
             ;
     }