michaelh/zephyr
1
0
Fork 0
Code Releases Activity

samples: subsys: usb: dfu: Fix build error for intel_s1000

Browse source 
intel_s1000 uses DT_SPI_NOR_DRV_NAME instead of DT_FLASH_DEV_NAME
for device binding of flash device.

Signed-off-by: Savinay Dharmappa <savinay.dharmappa@intel.com>
This commit is contained in:
Savinay Dharmappa 2018-12-10 14:49:24 +05:30 • committed by Anas Nashif
commit b9b8daa3bc
2 changed files with 8 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
subsys/dfu/boot/mcuboot.c
View file

@ -497,7 +497,11 @@ int boot_erase_img_bank(u32_t bank_offset)
static int boot_init(struct device *dev) static int boot_init(struct device *dev)
{ {
ARG_UNUSED(dev); ARG_UNUSED(dev);
#if defined(DT_FLASH_DEV_NAME)
flash_dev = device_get_binding(DT_FLASH_DEV_NAME); flash_dev = device_get_binding(DT_FLASH_DEV_NAME);
#elif defined(DT_SPI_NOR_DRV_NAME)
flash_dev = device_get_binding(DT_SPI_NOR_DRV_NAME);
#endif
if (!flash_dev) { if (!flash_dev) {
return -ENODEV; return -ENODEV;
} }

4
subsys/usb/class/usb_dfu.c
View file

@ -685,7 +685,11 @@ static int usb_dfu_init(struct device *dev)
ARG_UNUSED(dev); ARG_UNUSED(dev);
#if defined(DT_FLASH_DEV_NAME)
dfu_data.flash_dev = device_get_binding(DT_FLASH_DEV_NAME); dfu_data.flash_dev = device_get_binding(DT_FLASH_DEV_NAME);
#elif defined(DT_SPI_NOR_DRV_NAME)
dfu_data.flash_dev = device_get_binding(DT_SPI_NOR_DRV_NAME);
#endif
if (!dfu_data.flash_dev) { if (!dfu_data.flash_dev) {
LOG_ERR("Flash device not found\n"); LOG_ERR("Flash device not found\n");
return -ENODEV; return -ENODEV;