Merge branch 'master' of http://www.kernel.org/pub/scm/linux/kernel/git/torvalds...

[zynq/linux.git] / drivers / net / Kconfig

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index f4182cfffe9d4c62c02b64b14d17d252a87dc6d7..ef42c194bd8040b5ea58e0c53e68a6d807a66dc3 100644 (file)
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -1884,6 +1884,23 @@ config NE_H8300
          Say Y here if you want to use the NE2000 compatible
          controller on the Renesas H8/300 processor.
 
+config XILINX_EMAC
+       tristate "Xilinx 10/100 OPB EMAC support"
+       depends on XILINX_DRIVERS
+       select XILINX_EDK
+       select NEED_XILINX_IPIF
+       help
+         This driver supports the Xilinx 10/100 opb_emac
+
+config XILINX_EMACLITE
+       tristate "Xilinx 10/100 OPB EMACLITE support"
+       depends on XILINX_DRIVERS
+       select XILINX_EDK
+       select NEED_XILINX_IPIF
+       help
+         This driver supports the 10/100 OPB EMACLITE.
+
+
 source "drivers/net/fec_8xx/Kconfig"
 source "drivers/net/fs_enet/Kconfig"
 
@@ -2352,6 +2369,51 @@ config ATL1
          To compile this driver as a module, choose M here.  The module
          will be called atl1.
 
+config XILINX_TEMAC
+       tristate "Xilinx TEMAC 10/100/1000 Ethernet MAC driver"
+       depends on XILINX_DRIVERS
+       select XILINX_EDK
+       select NEED_XILINX_DMAV3
+       select NEED_XILINX_IPIF
+       help
+         This driver supports the Xilinx TEMAC found in Virtex 4 FPGAs
+         when the plb_temac adapter interface is used.
+
+config XILINX_LLTEMAC
+       tristate "Xilinx LLTEMAC 10/100/1000 Ethernet MAC driver"
+       depends on XILINX_DRIVERS
+       select XILINX_EDK
+       select NEED_XILINX_LLDMA
+       help
+         This driver supports the 10/100/1000 LLTEMAC.
+
+choice
+       prompt "Xilinx LLTEMAC PHY Support"
+       default XILINX_LLTEMAC_MARVELL_88E1111_GMII
+       
+config XILINX_LLTEMAC_MARVELL_88E1111_RGMII
+       bool "MARVELL 88E1111 using RGMII"
+   help
+         This phy is used by many Xilinx boards.  This option includes
+         code for enabling RGMII over copper.
+
+config XILINX_LLTEMAC_MARVELL_88E1111_GMII
+       bool "MARVELL 88E1111 using GMII"
+   help
+         This phy is used by many Xilinx boards.  This option includes
+         code for enabling GMII over copper, and for setting the correct
+         speed based on whatever the phy is able to autonegotiate.  This is
+         usually the best option to use on ML40x and ML50x boards.
+
+config XILINX_LLTEMAC_MARVELL_88E1111_MII
+       bool "MARVELL 88E1111 using MII or other PHY"
+   help
+         If your physical interface is not covered by the other
+         selections, then choose this option.  This option includes generic
+         speed autonegotation code.
+
+endchoice
+
 endif # NETDEV_1000
 
 #