Merge branch 'master' of git://git.denx.de/u-boot-usb
diff --git a/common/dfu.c b/common/dfu.c
index 4c529f7..0e9f5f5 100644
--- a/common/dfu.c
+++ b/common/dfu.c
@@ -24,7 +24,11 @@
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 20dfcbb..8dacc1a 100644
--- a/drivers/dfu/dfu.c
+++ b/drivers/dfu/dfu.c
@@ -482,7 +482,7 @@
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];
}