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

[oweals/u-boot.git] / drivers / net / Kconfig

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index d67927cd3b84272c50de254ece28bbec99bd7e70..de1947ccc1731938b5abe07622584f8e4f5171fe 100644 (file)
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -160,12 +160,12 @@ config FTMAC100
          This MAC is present in Andestech SoCs.
 
 config MVNETA
-       bool "Marvell Armada 385 network interface support"
-       depends on ARMADA_XP || ARMADA_38X
+       bool "Marvell Armada XP/385/3700 network interface support"
+       depends on ARMADA_XP || ARMADA_38X || ARMADA_3700
        select PHYLIB
        help
          This driver supports the network interface units in the
-         Marvell ARMADA XP and 38X SoCs
+         Marvell ARMADA XP, ARMADA 38X and ARMADA 3700 SoCs
 
 config MVPP2
        bool "Marvell Armada 375/7K/8K network interface support"
@@ -185,6 +185,13 @@ config MACB
          GEM (Gigabit Ethernet MAC) found in some ARM SoC devices.
          Say Y to include support for the MACB/GEM chip.
 
+config MACB_ZYNQ
+       bool "Cadence MACB/GEM Ethernet Interface for Xilinx Zynq"
+       depends on MACB
+       help
+         The Cadence MACB ethernet interface was used on Zynq platform.
+         Say Y to enable support for the MACB/GEM in Zynq chip.
+
 config PCH_GBE
        bool "Intel Platform Controller Hub EG20T GMAC driver"
        depends on DM_ETH && DM_PCI
@@ -211,14 +218,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.
 
@@ -232,6 +276,12 @@ config SUN8I_EMAC
          It can be found in H3/A64/A83T based SoCs and compatible with both
          External and Internal PHYs.
 
+config SH_ETHER
+       bool "Renesas SH Ethernet MAC"
+       select PHYLIB
+       help
+         This driver supports the Ethernet for Renesas SH and ARM SoCs.
+
 config XILINX_AXIEMAC
        depends on DM_ETH && (MICROBLAZE || ARCH_ZYNQ || ARCH_ZYNQMP)
        select PHYLIB
@@ -336,4 +386,28 @@ config FEC2_PHY_NORXERR
          The PHY does not have a RXERR line (RMII only).
          (so program the FEC to ignore it).
 
+config SYS_DPAA_QBMAN
+       bool "Device tree fixup for QBMan on freescale SOCs"
+       depends on (ARM || PPC) && !SPL_BUILD
+       default y if ARCH_B4860 || \
+                    ARCH_B4420 || \
+                    ARCH_P1023 || \
+                    ARCH_P2041 || \
+                    ARCH_T1023 || \
+                    ARCH_T1024 || \
+                    ARCH_T1040 || \
+                    ARCH_T1042 || \
+                    ARCH_T2080 || \
+                    ARCH_T2081 || \
+                    ARCH_T4240 || \
+                    ARCH_T4160 || \
+                    ARCH_P4080 || \
+                    ARCH_P3041 || \
+                    ARCH_P5040 || \
+                    ARCH_P5020 || \
+                    ARCH_LS1043A || \
+                    ARCH_LS1046A
+       help
+         QBman fixups to allow deep sleep in DPAA 1 SOCs
+
 endif # NETDEVICES