diff options
| author | Tom Rini <trini@ti.com> | 2014-12-31 15:10:36 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-12-31 15:10:36 -0500 |
| commit | b7b3b8c6a0bfc87047cb18a7abfa06fb6e9d0331 (patch) | |
| tree | 47dc3ac1f5dbdf54d1f622f5b83d174ff35e0556 /include | |
| parent | 6d76e2aca82a0da47df80304211203f80b09f082 (diff) | |
| parent | edd88905ae292355991f13fd0d3c7b3368103050 (diff) | |
| download | talos-obmc-uboot-b7b3b8c6a0bfc87047cb18a7abfa06fb6e9d0331.tar.gz talos-obmc-uboot-b7b3b8c6a0bfc87047cb18a7abfa06fb6e9d0331.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-usb
Conflicts:
include/configs/arndale.h
Signed-off-by: Tom Rini <trini@ti.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/arndale.h | 5 | ||||
| -rw-r--r-- | include/usb_ether.h | 6 |
2 files changed, 11 insertions, 0 deletions
diff --git a/include/configs/arndale.h b/include/configs/arndale.h index 6bd27a2446..d68993bb1f 100644 --- a/include/configs/arndale.h +++ b/include/configs/arndale.h @@ -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 diff --git a/include/usb_ether.h b/include/usb_ether.h index 35700a21b5..b38d037fbe 100644 --- a/include/usb_ether.h +++ b/include/usb_ether.h @@ -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); |
