diff options
| author | Michal Simek <michal.simek@xilinx.com> | 2015-12-09 16:54:42 +0100 |
|---|---|---|
| committer | Michal Simek <michal.simek@xilinx.com> | 2016-01-27 15:55:51 +0100 |
| commit | 338a5f2bf1f3ec543dd9c6ce0d74ebe969bc7582 (patch) | |
| tree | 73d23097213e47539d5c7ec77c8a9a51545384f2 | |
| parent | ad499e42be291e789585cd282cf05e29612018e6 (diff) | |
| download | talos-obmc-uboot-338a5f2bf1f3ec543dd9c6ce0d74ebe969bc7582.tar.gz talos-obmc-uboot-338a5f2bf1f3ec543dd9c6ce0d74ebe969bc7582.zip | |
net: Add axi emac to Kconfig
Also add dependency on PHYLIB and MII which is required.
Clean PHYLIB dependency from the driver too.
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
| -rw-r--r-- | drivers/net/Kconfig | 8 | ||||
| -rw-r--r-- | drivers/net/xilinx_axi_emac.c | 4 |
2 files changed, 8 insertions, 4 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index de54ca8014..ee15359040 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -102,6 +102,14 @@ config PCH_GBE This MAC is present in Intel Platform Controller Hub EG20T. It supports 10/100/1000 Mbps operation. +config XILINX_AXIEMAC + depends on DM_ETH && (MICROBLAZE || ARCH_ZYNQ || ARCH_ZYNQMP) + select PHYLIB + select MII + bool "Xilinx AXI Ethernet" + help + This MAC is present in Xilinx Microblaze, Zynq and ZynqMP SoCs. + config ZYNQ_GEM depends on DM_ETH && (ARCH_ZYNQ || ARCH_ZYNQMP) select PHYLIB diff --git a/drivers/net/xilinx_axi_emac.c b/drivers/net/xilinx_axi_emac.c index 4a514d08ae..81274ee13b 100644 --- a/drivers/net/xilinx_axi_emac.c +++ b/drivers/net/xilinx_axi_emac.c @@ -17,10 +17,6 @@ DECLARE_GLOBAL_DATA_PTR; -#if !defined(CONFIG_PHYLIB) -# error AXI_ETHERNET requires PHYLIB -#endif - /* Link setup */ #define XAE_EMMC_LINKSPEED_MASK 0xC0000000 /* Link speed */ #define XAE_EMMC_LINKSPD_10 0x00000000 /* Link Speed mask for 10 Mbit */ |
