Merge branch 'master' of git://git.denx.de/u-boot-nds32

[u-boot] / drivers / net / Kconfig

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index f52629fa53ffed56207c81a12a037cc42f7e2656..d49bf572f8f92798592c0b7c386ff0c379750671 100644 (file)
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -1,3 +1,5 @@
+source "drivers/net/phy/Kconfig"
+
 config DM_ETH
        bool "Enable Driver Model for Ethernet drivers"
        depends on DM
@@ -8,32 +10,6 @@ config DM_ETH
          This is currently implemented in net/eth.c
          Look in include/net.h for details.
 
-config PHYLIB
-       bool "Ethernet PHY (physical media interface) support"
-       help
-         Enable Ethernet PHY (physical media interface) support.
-
-config RTL8211X_PHY_FORCE_MASTER
-       bool "Ethernet PHY RTL8211x: force 1000BASE-T master mode"
-       depends on PHYLIB
-       help
-         Force master mode for 1000BASE-T on RTl8211x PHYs (except for RTL8211F).
-         This can work around link stability and data corruption issues on gigabit
-         links which can occur in slave mode on certain PHYs, e.g. on the
-         RTL8211C(L).
-
-         Please note that two directly connected devices (i.e. via crossover cable)
-         will not be able to establish a link between each other if they both force
-         master mode. Multiple devices forcing master mode when connected by a
-         network switch do not pose a problem as the switch configures its affected
-         ports into slave mode.
-
-         This option only affects gigabit links. If you must establish a direct
-         connection between two devices which both force master mode, try forcing
-         the link speed to 100MBit/s.
-
-         If unsure, say N.
-
 menuconfig NETDEVICES
        bool "Network device support"
        depends on NET
@@ -147,13 +123,28 @@ config FEC_MXC
          This driver supports the 10/100 Fast Ethernet controller for
          NXP i.MX processors.
 
+config FTMAC100
+       bool "Ftmac100 Ethernet Support"
+       help
+         This MAC is present in Andestech SoCs.
+
 config MVPP2
-       bool "Marvell Armada 375 network interface support"
-       depends on ARMADA_375
+       bool "Marvell Armada 375/7K/8K network interface support"
+       depends on ARMADA_375 || ARMADA_8K
        select PHYLIB
        help
          This driver supports the network interface units in the
-         Marvell ARMADA 375 SoC.
+         Marvell ARMADA 375, 7K and 8K SoCs.
+
+config MACB
+       bool "Cadence MACB/GEM Ethernet Interface"
+       depends on DM_ETH
+       select PHYLIB
+       help
+         The Cadence MACB ethernet interface is found on many Atmel
+         AT91 and SAMA5 parts.  This driver also supports the Cadence
+         GEM (Gigabit Ethernet MAC) found in some ARM SoC devices.
+         Say Y to include support for the MACB/GEM chip.
 
 config PCH_GBE
        bool "Intel Platform Controller Hub EG20T GMAC driver"
@@ -163,6 +154,12 @@ config PCH_GBE
          This MAC is present in Intel Platform Controller Hub EG20T. It
          supports 10/100/1000 Mbps operation.
 
+config RGMII
+       bool "Enable RGMII"
+       help
+         Enable the support of the Reduced Gigabit Media-Independent
+         Interface (RGMII).
+
 config RTL8139
        bool "Realtek 8139 series Ethernet controller driver"
        help
@@ -175,6 +172,17 @@ config RTL8169
          This driver supports Realtek 8169 series gigabit ethernet family of
          PCI/PCIe chipsets/adapters.
 
+config SUN7I_GMAC
+       bool "Enable Allwinner GMAC Ethernet support"
+       help
+         Enable the support for Sun7i GMAC Ethernet controller
+
+config SUN4I_EMAC
+       bool "Allwinner Sun4i Ethernet MAC support"
+       depends on DM_ETH
+       help
+         This driver supports the Allwinner based SUN4I Ethernet MAC.
+
 config SUN8I_EMAC
         bool "Allwinner Sun8i Ethernet MAC support"
         depends on DM_ETH
@@ -182,7 +190,7 @@ config SUN8I_EMAC
         help
           This driver supports the  Allwinner based SUN8I/SUN50I Ethernet MAC.
          It can be found in H3/A64/A83T based SoCs and compatible with both
-         External and Internal PHY's.
+         External and Internal PHYs.
 
 config XILINX_AXIEMAC
        depends on DM_ETH && (MICROBLAZE || ARCH_ZYNQ || ARCH_ZYNQMP)
@@ -222,4 +230,12 @@ config GMAC_ROCKCHIP
          This driver provides Rockchip SoCs network support based on the
          Synopsys Designware driver.
 
+config RENESAS_RAVB
+       bool "Renesas Ethernet AVB MAC"
+       depends on DM_ETH && RCAR_GEN3
+       select PHYLIB
+       help
+         This driver implements support for the Ethernet AVB block in
+         Renesas M3 and H3 SoCs.
+
 endif # NETDEVICES