diff options
| author | Tom Rini <trini@konsulko.com> | 2017-04-04 09:17:56 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-04-04 09:17:56 -0400 |
| commit | f532703665ae5e5957211bbc4e7296a8313cc403 (patch) | |
| tree | 83553bf3d230f555feadaa1d3958742f232bd4cc /include | |
| parent | 797f165f7ae90a75579ae3df7932d8d1518e8544 (diff) | |
| parent | 941f7a4b2606ef468f4f3b763261b758eadee861 (diff) | |
Merge git://www.denx.de/git/u-boot-marvell
This includes Marvell mvpp2 patches with the ethernet support for the
ARMv8 Armada 7k/8k platforms. The ethernet patches are all acked by Joe
and he is okay with me pushing them via the Marvell tree.
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/mvebu_armada-8k.h | 8 | ||||
| -rw-r--r-- | include/linux/bitops.h | 1 | ||||
| -rw-r--r-- | include/phy.h | 6 |
3 files changed, 15 insertions, 0 deletions
diff --git a/include/configs/mvebu_armada-8k.h b/include/configs/mvebu_armada-8k.h index a8a9d15b5e..8ee5f27a97 100644 --- a/include/configs/mvebu_armada-8k.h +++ b/include/configs/mvebu_armada-8k.h @@ -81,6 +81,14 @@ #define CONFIG_ENV_SIZE (64 << 10) /* 64KiB */ #define CONFIG_ENV_SECT_SIZE (64 << 10) /* 64KiB sectors */ +/* + * Ethernet Driver configuration + */ +#define CONFIG_ENV_OVERWRITE /* ethaddr can be reprogrammed */ +#define CONFIG_PHY_GIGE /* GbE speed/duplex detect */ +#define CONFIG_ARP_TIMEOUT 200 +#define CONFIG_NET_RETRY_COUNT 50 + /* USB 2.0 */ #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 3 diff --git a/include/linux/bitops.h b/include/linux/bitops.h index 1b2e4915a0..576b15dc53 100644 --- a/include/linux/bitops.h +++ b/include/linux/bitops.h @@ -2,6 +2,7 @@ #define _LINUX_BITOPS_H #include <asm/types.h> +#include <asm-generic/bitsperlong.h> #include <linux/compiler.h> #define BIT(nr) (1UL << (nr)) diff --git a/include/phy.h b/include/phy.h index f5fdc04b6e..4f2094bdf0 100644 --- a/include/phy.h +++ b/include/phy.h @@ -63,6 +63,9 @@ typedef enum { PHY_INTERFACE_MODE_RGMII_TXID, PHY_INTERFACE_MODE_RTBI, PHY_INTERFACE_MODE_XGMII, + PHY_INTERFACE_MODE_XAUI, + PHY_INTERFACE_MODE_RXAUI, + PHY_INTERFACE_MODE_SFI, PHY_INTERFACE_MODE_NONE, /* Must be last */ PHY_INTERFACE_MODE_COUNT, @@ -82,6 +85,9 @@ static const char *phy_interface_strings[] = { [PHY_INTERFACE_MODE_RGMII_TXID] = "rgmii-txid", [PHY_INTERFACE_MODE_RTBI] = "rtbi", [PHY_INTERFACE_MODE_XGMII] = "xgmii", + [PHY_INTERFACE_MODE_XAUI] = "xaui", + [PHY_INTERFACE_MODE_RXAUI] = "rxaui", + [PHY_INTERFACE_MODE_SFI] = "sfi", [PHY_INTERFACE_MODE_NONE] = "", }; |