diff options
| author | Tom Rini <[email protected]> | 2017-08-21 07:16:56 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2017-08-21 07:16:56 -0400 |
| commit | 09b6a6dd010cad18ef1cea2cf579244f0fd17ce4 (patch) | |
| tree | 2c527aa1bc458d76f4565592bee72c9c7f2a0327 /drivers | |
| parent | 8197d92843952b376915fdbcbf67c723feab1532 (diff) | |
| parent | 5bf4475f1d7726541edec0060c6461fbb37db02d (diff) | |
Merge git://git.denx.de/u-boot-usb
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/usb/gadget/f_fastboot.c | 4 | ||||
| -rw-r--r-- | drivers/usb/host/Kconfig | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/drivers/usb/gadget/f_fastboot.c b/drivers/usb/gadget/f_fastboot.c index d05b74b2d2a..199621d9f54 100644 --- a/drivers/usb/gadget/f_fastboot.c +++ b/drivers/usb/gadget/f_fastboot.c @@ -561,7 +561,7 @@ static void do_bootm_on_complete(struct usb_ep *ep, struct usb_request *req) puts("Booting kernel..\n"); - sprintf(boot_addr_start, "0x%lx", load_addr); + sprintf(boot_addr_start, "0x%lx", CONFIG_FASTBOOT_BUF_ADDR); do_bootm(NULL, 0, 2, bootm_args); /* This only happens if image is somehow faulty so we start over */ @@ -718,7 +718,7 @@ static void rx_handler_command(struct usb_ep *ep, struct usb_request *req) } if (!func_cb) { - error("unknown command: %s", cmdbuf); + error("unknown command: %.*s", req->actual, cmdbuf); fastboot_tx_write_str("FAILunknown command"); } else { if (req->actual < req->length) { diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig index 67ad72b4a2c..eb035a476be 100644 --- a/drivers/usb/host/Kconfig +++ b/drivers/usb/host/Kconfig @@ -142,6 +142,12 @@ config USB_EHCI_MSM This driver supports combination of Chipidea USB controller and Synapsys USB PHY in host mode only. +config USB_EHCI_PCI + bool "Support for PCI-based EHCI USB controller" + default y if X86 + help + Enables support for the PCI-based EHCI controller. + config USB_EHCI_RCAR_GEN3 bool "Support for Renesas RCar M3/H3 EHCI USB controller" depends on RCAR_GEN3 |