diff options
| author | Vincent Palatin <vpalatin@chromium.org> | 2011-08-01 11:39:45 -0700 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2011-08-29 10:59:23 -0700 |
| commit | 2ea85c0681a7e2bda2b4e357ac3cd5f30c2f55fc (patch) | |
| tree | 01a6d7451a78b5926f040647f79b950cef393e69 /common | |
| parent | 543dcf8597c17efd0646c3f5f45d3740dbdb4266 (diff) | |
usb: move USB keyboard initialization
Do it at the same place as other USB drivers (mass storage and ethernet)
BUG=chrome-os-partner:5043
TEST=compile U-Boot
Change-Id: I2467a2cfd165522f4bbdee3456cedc293b648c7c
Reviewed-on: http://gerrit.chromium.org/gerrit/5084
Reviewed-by: Vincent Palatin <vpalatin@chromium.org>
Tested-by: Vincent Palatin <vpalatin@chromium.org>
Diffstat (limited to 'common')
| -rw-r--r-- | common/cmd_usb.c | 3 | ||||
| -rw-r--r-- | common/usb.c | 5 |
2 files changed, 3 insertions, 5 deletions
diff --git a/common/cmd_usb.c b/common/cmd_usb.c index c7b30a032b..76474423f7 100644 --- a/common/cmd_usb.c +++ b/common/cmd_usb.c @@ -527,6 +527,9 @@ int do_usb(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) printf("(Re)start USB...\n"); i = usb_init(); if (i >= 0) { +#ifdef CONFIG_USB_KEYBOARD + drv_usb_kbd_init(); +#endif #ifdef CONFIG_USB_STORAGE /* try to recognize storage devices immediately */ usb_stor_curr_dev = usb_stor_scan(1); diff --git a/common/usb.c b/common/usb.c index c955fcbf23..0b71b2f46a 100644 --- a/common/usb.c +++ b/common/usb.c @@ -966,11 +966,6 @@ void usb_scan_devices(void) printf("No USB Device found\n"); else printf("%d USB Device(s) found\n", dev_index); - /* insert "driver" if possible */ -#ifdef CONFIG_USB_KEYBOARD - drv_usb_kbd_init(); - USB_PRINTF("scan end\n"); -#endif } |