V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge branch 'master' of git://git.denx.de/u-boot-usb

This commit is contained in:
Tom Rini 2016-11-03 07:09:42 -04:00
parent 7fd117389e dd93a8e9e6
commit eef55e5fca
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/dfu.c
View File

@ -24,7 +24,11 @@ int run_usb_dnl_gadget(int usbctrl_index, char *usb_dnl_gadget)
bool dfu_reset = false; bool dfu_reset = false;
int ret, i = 0; 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(); g_dnl_clear_detach();
ret = g_dnl_register(usb_dnl_gadget); ret = g_dnl_register(usb_dnl_gadget);
if (ret) { if (ret) {

2
drivers/dfu/dfu.c
View File

@ -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 *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]; return dev_t[t];
} }