Merge git://git.denx.de/u-boot-spi

[people/ms/u-boot.git] / drivers / net / Kconfig

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 5ceea44c60535c0ddae59bd663fdae7f39cf2478..d42d915f17f4128752e6a1d94c78968bcccebed3 100644 (file)
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -159,6 +159,14 @@ config FTMAC100
        help
          This MAC is present in Andestech SoCs.
 
+config MVNETA
+       bool "Marvell Armada 385 network interface support"
+       depends on ARMADA_XP || ARMADA_38X
+       select PHYLIB
+       help
+         This driver supports the network interface units in the
+         Marvell ARMADA XP and 38X SoCs
+
 config MVPP2
        bool "Marvell Armada 375/7K/8K network interface support"
        depends on ARMADA_375 || ARMADA_8K
@@ -203,14 +211,51 @@ config RTL8169
          This driver supports Realtek 8169 series gigabit ethernet family of
          PCI/PCIe chipsets/adapters.
 
+config SMC911X
+       bool "SMSC LAN911x and LAN921x controller driver"
+
+if SMC911X
+
+config SMC911X_BASE
+       hex "SMC911X Base Address"
+       help
+         Define this to hold the physical address
+         of the device (I/O space)
+
+choice
+       prompt "SMC911X bus width"
+       default SMC911X_16_BIT
+
+config SMC911X_32_BIT
+       bool "Enable 32-bit interface"
+
+config SMC911X_16_BIT
+       bool "Enable 16-bit interface"
+       help
+         Define this if data bus is 16 bits. If your processor
+         automatically converts one 32 bit word to two 16 bit
+         words you may also try CONFIG_SMC911X_32_BIT.
+
+endchoice
+endif #SMC911X
+
 config SUN7I_GMAC
        bool "Enable Allwinner GMAC Ethernet support"
        help
          Enable the support for Sun7i GMAC Ethernet controller
 
+config SUN7I_GMAC_FORCE_TXERR
+       bool "Force PA17 as gmac function"
+       depends on SUN7I_GMAC
+       help
+         Some ethernet phys needs TXERR control. Since the GMAC
+         doesn't have such signal, setting PA17 as GMAC function
+         makes the pin output low, which enables data transmission.
+
 config SUN4I_EMAC
        bool "Allwinner Sun4i Ethernet MAC support"
        depends on DM_ETH
+       select PHYLIB
        help
          This driver supports the Allwinner based SUN4I Ethernet MAC.