mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-24 21:54:01 +00:00
Merge branch 'master' of git://git.denx.de/u-boot-usb
- Fastboot fixes
This commit is contained in:
commit
7eddda4537
3 changed files with 8 additions and 3 deletions
|
@ -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);
|
||||
}
|
||||
|
||||
|
|
|
@ -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
|
||||
};
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Reference in a new issue