diff options
author | Tom Rini <trini@konsulko.com> | 2020-05-19 10:51:43 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2020-05-19 10:51:43 -0400 |
commit | c2279d784e35fa25ee3a9fa28a74a1ba545f8c1e (patch) | |
tree | 158fd30f3d06142f6a99cbae6ed8ccb0f3be567b /cmd/usb.c | |
parent | ed9a3aa6452f57af65eb74f73bd2a54c3a2f4b03 (diff) | |
parent | cd93d625fd751d55c729c78b10f82109d56a5f1d (diff) |
Merge branch '2020-05-18-reduce-size-of-common.h'
Bring in the latest round of Simon's changes to reduce what's in
<common.h> overall.
Diffstat (limited to 'cmd/usb.c')
-rw-r--r-- | cmd/usb.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/cmd/usb.c b/cmd/usb.c index dd9ac0bc976..b9ec29a8457 100644 --- a/cmd/usb.c +++ b/cmd/usb.c @@ -11,6 +11,8 @@ */ #include <common.h> +#include <blk.h> +#include <bootstage.h> #include <command.h> #include <console.h> #include <dm.h> @@ -554,7 +556,8 @@ static int usb_test(struct usb_device *dev, int port, char* arg) * usb boot command intepreter. Derived from diskboot */ #ifdef CONFIG_USB_STORAGE -static int do_usbboot(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +static int do_usbboot(struct cmd_tbl *cmdtp, int flag, int argc, + char *const argv[]) { return common_diskboot(cmdtp, "usb", argc, argv); } @@ -623,7 +626,7 @@ static void usb_show_info(struct usb_device *udev) /****************************************************************************** * usb command intepreter */ -static int do_usb(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +static int do_usb(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { struct usb_device *udev = NULL; int i; |