Merge branch 'master' of git://git.denx.de/u-boot-usb
This commit is contained in:
commit
eef55e5fca
|
@ -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) {
|
||||
|
|
|
@ -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];
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue