diff options
| author | Tom Rini | 2019-03-19 07:13:03 -0400 |
|---|---|---|
| committer | Tom Rini | 2019-03-19 07:13:03 -0400 |
| commit | 7eddda453710d2405e05bb0b79612103608c244a (patch) | |
| tree | 418474f64fa7c1791822efcad588e5826dff17e1 | |
| parent | 374bf7af033aa326a9585c5ff878d206e90c0c1c (diff) | |
| parent | f402d268e8e17e9d6d1d9bf8a8b1f6e0b07718ef (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-usb
- Fastboot fixes
| -rw-r--r-- | cmd/fastboot.c | 2 | ||||
| -rw-r--r-- | drivers/fastboot/fb_common.c | 2 | ||||
| -rw-r--r-- | drivers/usb/gadget/udc/udc-uclass.c | 7 |
3 files changed, 8 insertions, 3 deletions
diff --git a/cmd/fastboot.c b/cmd/fastboot.c index 0be83b78ac1..1b4215114d7 100644 --- a/cmd/fastboot.c +++ b/cmd/fastboot.c @@ -13,6 +13,7 @@ #include <fastboot.h> #include <net.h> #include <usb.h> +#include <watchdog.h> static int do_fastboot_udp(int argc, char *const argv[], uintptr_t buf_addr, size_t buf_size) @@ -74,6 +75,7 @@ static int do_fastboot_usb(int argc, char *const argv[], break; if (ctrlc()) break; + WATCHDOG_RESET(); usb_gadget_handle_interrupts(controller_index); } diff --git a/drivers/fastboot/fb_common.c b/drivers/fastboot/fb_common.c index c6e06aab7aa..17eca73be02 100644 --- a/drivers/fastboot/fb_common.c +++ b/drivers/fastboot/fb_common.c @@ -119,7 +119,7 @@ void fastboot_boot(void) if (s) { run_command(s, CMD_FLAG_ENV); } else { - static char boot_addr_start[12]; + static char boot_addr_start[20]; static char *const bootm_args[] = { "bootm", boot_addr_start, NULL }; diff --git a/drivers/usb/gadget/udc/udc-uclass.c b/drivers/usb/gadget/udc/udc-uclass.c index 8d7864797a7..3053ccf7d97 100644 --- a/drivers/usb/gadget/udc/udc-uclass.c +++ b/drivers/usb/gadget/udc/udc-uclass.c @@ -23,8 +23,11 @@ int usb_gadget_initialize(int index) return 0; ret = uclass_get_device_by_seq(UCLASS_USB_GADGET_GENERIC, index, &dev); if (!dev || ret) { - pr_err("No USB device found\n"); - return -ENODEV; + ret = uclass_get_device(UCLASS_USB_GADGET_GENERIC, index, &dev); + if (!dev || ret) { + pr_err("No USB device found\n"); + return -ENODEV; + } } dev_array[index] = dev; return 0; |