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

zephyr: add compatibility shim for flash driver name 

The upstream Zephyr project is renaming FLASH_DRIVER_NAME to
FLASH_DEV_NAME as part of some changes related to device tree.

Work around this for now by keeping the MCUboot name the same if
FLASH_DRIVER_NAME is not provided by Zephyr, but FLASH_DEV_NAME is.

Signed-off-by: Marti Bolivar <marti@opensourcefoundries.com>
This commit is contained in:
Marti Bolivar 2018-01-31 14:14:40 -05:00 committed by David Brown
parent aefbd46631
commit 6f2857c2a7
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,6 +30,16 @@
#endif
#endif /* !defined(MCUBOOT_TARGET_CONFIG) */
/*
* Upstream Zephyr changed the name from FLASH_DRIVER_NAME to
* FLASH_DEV_NAME. For now, let's just convert the Zephyr name to the
* one expected by MCUboot. This can be cleaned up after the upstream
* Zephyr tree has been released and settled down.
*/
#if !defined(FLASH_DRIVER_NAME) && defined(FLASH_DEV_NAME)
#define FLASH_DRIVER_NAME FLASH_DEV_NAME
#endif
/*
* Sanity check the target support.
*/