OrgZephyr/mcuboot
OrgZephyr
/
mcuboot
mirror of https://github.com/zephyrproject-rtos/mcuboot.git
1
0
Fork 0
Code Issues Releases Wiki Activity

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>
This commit is contained in:
Andrzej Puzdrowski 2018-11-14 14:33:19 +01:00 committed by Carles Cufí
parent 865777ddc9
commit f50054d998
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
boot/zephyr/include/target.h
View File

@ -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) || \

4
boot/zephyr/main.c
View File

@ -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)
;
}