commit f50054d9986a2c565023bd159b653988acd261af
author Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no> Wed Nov 14 14:33:19 2018 +0100
committer Carles Cufí <carles.cufi@nordicsemi.no> Wed Nov 14 14:56:35 2018 +0100
tree 9b5964383eefafa1fcf86bd6812a85567017f146
parent 865777ddc93df409f5b44946432fa4e57ca2c01d

fix zephyr target: corrupted build after zephyr PR #11180

zephyrproject-rtos/zephyr#11180: Zephyr target was corrupted as
recently zephyr's device tree started adding DT_ prefix in
generated labels.

This path aligns flash name macro used.


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 00251df..03e9098 100644
--- a/boot/zephyr/include/target.h
+++ b/boot/zephyr/include/target.h
@@ -33,7 +33,7 @@
 /*
  * Sanity check the target support.
  */
-#if !defined(FLASH_DEV_NAME) || \
+#if !defined(DT_FLASH_DEV_NAME) || \
     !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 1f097a6..d773dde 100644
--- a/boot/zephyr/main.c
+++ b/boot/zephyr/main.c
@@ -108,8 +108,8 @@
 
     os_heap_init();
 
-    if (!flash_device_get_binding(FLASH_DEV_NAME)) {
-        BOOT_LOG_ERR("Flash device %s not found", FLASH_DEV_NAME);
+    if (!flash_device_get_binding(DT_FLASH_DEV_NAME)) {
+        BOOT_LOG_ERR("Flash device %s not found", DT_FLASH_DEV_NAME);
         while (1)
             ;
     }