diff options
| author | Tom Rini | 2016-11-03 07:09:42 -0400 |
|---|---|---|
| committer | Tom Rini | 2016-11-03 07:09:42 -0400 |
| commit | eef55e5fcaacf874e2773127fb6660fcaabc7c35 (patch) | |
| tree | 2a3b04fc75cead5ef41dde42b38086e79dd25535 | |
| parent | 7fd117389ec7bbd0ce2fbb98ce47c20f5b8a0cfb (diff) | |
| parent | dd93a8e9e688f4c448092a275bf7db3e16d21c6f (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-usb
| -rw-r--r-- | common/dfu.c | 6 | ||||
| -rw-r--r-- | drivers/dfu/dfu.c | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/common/dfu.c b/common/dfu.c index 4c529f7c36f..0e9f5f59c80 100644 --- a/common/dfu.c +++ b/common/dfu.c @@ -24,7 +24,11 @@ int run_usb_dnl_gadget(int usbctrl_index, char *usb_dnl_gadget) bool dfu_reset = false; int ret, i = 0; - board_usb_init(usbctrl_index, USB_INIT_DEVICE); + ret = board_usb_init(usbctrl_index, USB_INIT_DEVICE); + if (ret) { + error("board usb init failed\n"); + return CMD_RET_FAILURE; + } g_dnl_clear_detach(); ret = g_dnl_register(usb_dnl_gadget); if (ret) { diff --git a/drivers/dfu/dfu.c b/drivers/dfu/dfu.c index 20dfcbbf18f..8dacc1a6d16 100644 --- a/drivers/dfu/dfu.c +++ b/drivers/dfu/dfu.c @@ -482,7 +482,7 @@ int dfu_config_entities(char *env, char *interface, char *devstr) const char *dfu_get_dev_type(enum dfu_device_type t) { - const char *dev_t[] = {NULL, "eMMC", "OneNAND", "NAND", "RAM" }; + const char *dev_t[] = {NULL, "eMMC", "OneNAND", "NAND", "RAM", "SF" }; return dev_t[t]; } |