mirror of
https://source.denx.de/u-boot/u-boot.git
synced 2026-06-13 15:03:58 +03:00
Merge branch 'master' of git://git.denx.de/u-boot-usb
Conflicts: include/configs/arndale.h Signed-off-by: Tom Rini <trini@ti.com>
This commit is contained in:
@@ -24,6 +24,11 @@
|
||||
#define CONFIG_USB_EHCI
|
||||
#define CONFIG_USB_EHCI_EXYNOS
|
||||
|
||||
#define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 3
|
||||
#define CONFIG_USB_HOST_ETHER
|
||||
#define CONFIG_USB_ETHER_ASIX
|
||||
#define CONFIG_USB_ETHER_ASIX88179
|
||||
|
||||
/* MMC SPL */
|
||||
#define CONFIG_EXYNOS_SPL
|
||||
|
||||
|
||||
@@ -49,6 +49,12 @@ int asix_eth_probe(struct usb_device *dev, unsigned int ifnum,
|
||||
int asix_eth_get_info(struct usb_device *dev, struct ueth_data *ss,
|
||||
struct eth_device *eth);
|
||||
|
||||
void ax88179_eth_before_probe(void);
|
||||
int ax88179_eth_probe(struct usb_device *dev, unsigned int ifnum,
|
||||
struct ueth_data *ss);
|
||||
int ax88179_eth_get_info(struct usb_device *dev, struct ueth_data *ss,
|
||||
struct eth_device *eth);
|
||||
|
||||
void mcs7830_eth_before_probe(void);
|
||||
int mcs7830_eth_probe(struct usb_device *dev, unsigned int ifnum,
|
||||
struct ueth_data *ss);
|
||||
|
||||
Reference in New Issue
Block a user