commit 465d024fcaebb735e4ee5fa7b8e62ddf25eb0d21
author Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no> Tue May 05 15:54:38 2020 +0200
committer Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no> Thu Jun 18 14:35:52 2020 +0200
tree b6644f458122739cf3efea4c62e87c29e17a34b1
parent 402f1d00961477465ac89997b0f08452b7647a1d

Revert "zephyr: Replace DT_FLASH_DEV_NAME with DT_CHOSEN_ZEPHYR_FLASH_CONTROLLER_LABEL"

This reverts commit 32b61f333b3e743f22a6813d601e552e12737065.

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 4723af1..b2de884 100644
--- a/boot/zephyr/flash_map_extended.c
+++ b/boot/zephyr/flash_map_extended.c
@@ -17,7 +17,7 @@
 
 MCUBOOT_LOG_MODULE_DECLARE(mcuboot);
 
-#if (!defined(CONFIG_XTENSA) && defined(DT_CHOSEN_ZEPHYR_FLASH_CONTROLLER_LABEL))
+#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_JEDEC_SPI_NOR_0_LABEL))

boot/zephyr/include/target.h

diff --git a/boot/zephyr/include/target.h b/boot/zephyr/include/target.h
index c14151c..7c86ff3 100644
--- a/boot/zephyr/include/target.h
+++ b/boot/zephyr/include/target.h
@@ -29,7 +29,7 @@
 /*
  * Sanity check the target support.
  */
-#if (!defined(CONFIG_XTENSA) && !defined(DT_CHOSEN_ZEPHYR_FLASH_CONTROLLER_LABEL)) || \
+#if (!defined(CONFIG_XTENSA) && !defined(DT_FLASH_DEV_NAME)) || \
     (defined(CONFIG_XTENSA) && !defined(DT_JEDEC_SPI_NOR_0_LABEL)) || \
     !defined(FLASH_ALIGN) ||                  \
     !(FLASH_AREA_LABEL_EXISTS(image_0)) || \

boot/zephyr/main.c

diff --git a/boot/zephyr/main.c b/boot/zephyr/main.c
index ce62851..978d517 100644
--- a/boot/zephyr/main.c
+++ b/boot/zephyr/main.c
@@ -277,10 +277,9 @@
 
     ZEPHYR_BOOT_LOG_START();
 
-#if (!defined(CONFIG_XTENSA) && defined(DT_CHOSEN_ZEPHYR_FLASH_CONTROLLER_LABEL))
-    if (!flash_device_get_binding(DT_CHOSEN_ZEPHYR_FLASH_CONTROLLER_LABEL)) {
-        BOOT_LOG_ERR("Flash device %s not found",
-		     DT_CHOSEN_ZEPHYR_FLASH_CONTROLLER_LABEL);
+#if (!defined(CONFIG_XTENSA) && defined(DT_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)
             ;
     }