diff options
| author | Tom Rini <trini@konsulko.com> | 2017-01-10 08:19:33 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-01-10 08:19:33 -0500 |
| commit | 04770e6e917b0f766a9496e3f37bcdf2ebb1beb4 (patch) | |
| tree | feb9550344f45c1c344fdd3a067de0ba28403991 /include | |
| parent | 86f21c96f46736825d8a9269dfbe31ef7991a7e6 (diff) | |
| parent | f8f41ae668040d58271e03bc85b58e13becb14af (diff) | |
| download | u-boot-04770e6e917b0f766a9496e3f37bcdf2ebb1beb4.tar.gz | |
Merge git://git.denx.de/u-boot-dm
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/am335x_evm.h | 3 | ||||
| -rw-r--r-- | include/net.h | 7 |
2 files changed, 7 insertions, 3 deletions
diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index 49c14df8ad..e78afde972 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -281,12 +281,9 @@ #endif #ifdef CONFIG_USB_MUSB_GADGET -/* Removing USB gadget and can be enabled adter adding support usb DM */ -#ifndef CONFIG_DM_ETH #define CONFIG_USB_ETHER #define CONFIG_USB_ETH_RNDIS #define CONFIG_USBNET_HOST_ADDR "de:ad:be:af:00:00" -#endif /* CONFIG_DM_ETH */ #endif /* CONFIG_USB_MUSB_GADGET */ /* diff --git a/include/net.h b/include/net.h index 06320c6514..1f4d947350 100644 --- a/include/net.h +++ b/include/net.h @@ -255,6 +255,13 @@ int eth_setenv_enetaddr_by_index(const char *base_name, int index, /* + * Initialize USB ethernet device with CONFIG_DM_ETH + * Returns: + * 0 is success, non-zero is error status. + */ +int usb_ether_init(void); + +/* * Get the hardware address for an ethernet interface . * Args: * base_name - base name for device (normally "eth") |