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>

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index de54ca8014c76ee80d74ef293120dba36fedf6c5..ee153590403e40d5631a2c01c68c50d2f7bdfd44 100644 (file)
--- 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 4a514d08ae0fac8592dcf7a45789420cf43b54eb..81274ee13bca869567ecc3986f4f90fe8c071f7d 100644 (file)
--- 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 */