Skip to content

Commit f50054d

Browse files
nvlsianpucarlescufi
authored andcommitted
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 <[email protected]>
1 parent 865777d commit f50054d

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

boot/zephyr/include/target.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
/*
3434
* Sanity check the target support.
3535
*/
36-
#if !defined(FLASH_DEV_NAME) || \
36+
#if !defined(DT_FLASH_DEV_NAME) || \
3737
!defined(FLASH_ALIGN) || \
3838
!defined(FLASH_AREA_IMAGE_0_OFFSET) || \
3939
!defined(FLASH_AREA_IMAGE_0_SIZE) || \

boot/zephyr/main.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,8 @@ void main(void)
108108

109109
os_heap_init();
110110

111-
if (!flash_device_get_binding(FLASH_DEV_NAME)) {
112-
BOOT_LOG_ERR("Flash device %s not found", FLASH_DEV_NAME);
111+
if (!flash_device_get_binding(DT_FLASH_DEV_NAME)) {
112+
BOOT_LOG_ERR("Flash device %s not found", DT_FLASH_DEV_NAME);
113113
while (1)
114114
;
115115
}

0 commit comments

Comments
 (0)