diff options
| author | Tom Rini <trini@konsulko.com> | 2016-01-25 17:23:19 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-01-25 17:23:19 -0500 |
| commit | 9c3193f8d03d4074fa6ca6b783246b97d8dc2ff5 (patch) | |
| tree | 9dbdb529e2a1d49fcb45d7e579c9e76f31664776 /include | |
| parent | d82477748d641e60ba3e1a0b55d98362aed70f80 (diff) | |
| parent | bdbcbe752e93357226cba12a6ce00bbe54cb5db8 (diff) | |
| download | u-boot-imx-9c3193f8d03d4074fa6ca6b783246b97d8dc2ff5.zip u-boot-imx-9c3193f8d03d4074fa6ca6b783246b97d8dc2ff5.tar.gz u-boot-imx-9c3193f8d03d4074fa6ca6b783246b97d8dc2ff5.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-usb
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/rpi-common.h | 6 | ||||
| -rw-r--r-- | include/usb_ether.h | 6 |
2 files changed, 11 insertions, 1 deletions
diff --git a/include/configs/rpi-common.h b/include/configs/rpi-common.h index 1b83eb3..927bae7 100644 --- a/include/configs/rpi-common.h +++ b/include/configs/rpi-common.h @@ -88,6 +88,9 @@ #define CONFIG_USB_HOST_ETHER #define CONFIG_USB_ETHER_SMSC95XX #define CONFIG_MISC_INIT_R +#define CONFIG_USB_KEYBOARD +#define CONFIG_SYS_USB_EVENT_POLL +#define CONFIG_SYS_STDIO_DEREGISTER #endif /* Console UART */ @@ -111,6 +114,7 @@ #define CONFIG_SYS_LOAD_ADDR 0x1000000 #define CONFIG_CONSOLE_MUX #define CONFIG_SYS_CONSOLE_IS_IN_ENV +#define CONFIG_PREBOOT "usb start" /* Shell */ #define CONFIG_SYS_MAXARGS 8 @@ -133,7 +137,7 @@ /* Environment */ #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG #define ENV_DEVICE_SETTINGS \ - "stdin=serial,lcd\0" \ + "stdin=serial,usbkbd\0" \ "stdout=serial,lcd\0" \ "stderr=serial,lcd\0" diff --git a/include/usb_ether.h b/include/usb_ether.h index c6d1416..51fce4e 100644 --- a/include/usb_ether.h +++ b/include/usb_ether.h @@ -131,6 +131,12 @@ int smsc95xx_eth_probe(struct usb_device *dev, unsigned int ifnum, struct ueth_data *ss); int smsc95xx_eth_get_info(struct usb_device *dev, struct ueth_data *ss, struct eth_device *eth); + +void r8152_eth_before_probe(void); +int r8152_eth_probe(struct usb_device *dev, unsigned int ifnum, + struct ueth_data *ss); +int r8152_eth_get_info(struct usb_device *dev, struct ueth_data *ss, + struct eth_device *eth); #endif #endif /* __USB_ETHER_H__ */ |