From f50054d9986a2c565023bd159b653988acd261af Mon Sep 17 00:00:00 2001 From: Andrzej Puzdrowski Date: Wed, 14 Nov 2018 14:33:19 +0100 Subject: [PATCH] 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 --- boot/zephyr/include/target.h | 2 +- boot/zephyr/main.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/boot/zephyr/include/target.h b/boot/zephyr/include/target.h index 00251dfd7..03e90989f 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) || \ diff --git a/boot/zephyr/main.c b/boot/zephyr/main.c index 1f097a67a..d773dded9 100644 --- a/boot/zephyr/main.c +++ b/boot/zephyr/main.c @@ -108,8 +108,8 @@ void main(void) 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) ; }