Merge tag 'efi-2020-07-rc2-4' of https://gitlab.denx.de/u-boot/custodians/u-boot-efi

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

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index eb3d7ed45f09ba52c00562e34e7325aef786090b..38f2bd6637decc0e7e178dc1d14c57509a1cbe16 100644 (file)
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -57,6 +57,12 @@ config MDIO_MUX_SANDBOX
 
          This driver is used for testing in test/dm/mdio.c
 
+config DM_ETH_PHY
+       bool "Enable Driver Model for Ethernet Generic PHY drivers"
+       depends on DM
+       help
+         Enable driver model for Ethernet Generic PHY .
+
 menuconfig NETDEVICES
        bool "Network device support"
        depends on NET
@@ -136,6 +142,13 @@ config BCM6368_ETH
        help
          This driver supports the BCM6368 Ethernet MAC.
 
+config BCMGENET
+       bool "BCMGENET V5 support"
+       depends on DM_ETH
+       select PHYLIB
+       help
+         This driver supports the BCMGENET Ethernet MAC.
+
 config DWC_ETH_QOS
        bool "Synopsys DWC Ethernet QOS device support"
        depends on DM_ETH
@@ -236,7 +249,7 @@ config FEC_MXC_MDIO_BASE
 
 config FEC_MXC
        bool "FEC Ethernet controller"
-       depends on MX28 || MX5 || MX6 || MX7 || IMX8 || VF610
+       depends on MX28 || MX5 || MX6 || MX7 || IMX8 || IMX8M || VF610
        help
          This driver supports the 10/100 Fast Ethernet controller for
          NXP i.MX processors.
@@ -278,6 +291,22 @@ config FTGMAC100
          applications.
 
 
+config MCFFEC
+       bool "ColdFire Ethernet Support"
+       depends on DM_ETH
+       select PHYLIB
+       help
+         This driver supports the network interface units in the
+         ColdFire family.
+
+config FSLDMAFEC
+        bool "ColdFire DMA Ethernet Support"
+       depends on DM_ETH
+       select PHYLIB
+       help
+         This driver supports the network interface units in the
+         ColdFire family.
+
 config MVGBE
        bool "Marvell Orion5x/Kirkwood network interface support"
        depends on KIRKWOOD || ORION5X
@@ -298,6 +327,8 @@ config MVPP2
        bool "Marvell Armada 375/7K/8K network interface support"
        depends on ARMADA_375 || ARMADA_8K
        select PHYLIB
+       select MVMDIO
+       select DM_MDIO
        help
          This driver supports the network interface units in the
          Marvell ARMADA 375, 7K and 8K SoCs.
@@ -363,11 +394,13 @@ config SMC911X
 
 if SMC911X
 
+if !DM_ETH
 config SMC911X_BASE
        hex "SMC911X Base Address"
        help
          Define this to hold the physical address
          of the device (I/O space)
+endif #DM_ETH
 
 choice
        prompt "SMC911X bus width"
@@ -615,4 +648,11 @@ config MVMDIO
 
          This driver is used by the MVPP2 and MVNETA drivers.
 
+config FSL_LS_MDIO
+       bool "NXP Layerscape MDIO interface support"
+       depends on DM_MDIO
+       help
+         This driver supports the MDIO bus found on the Fman 10G Ethernet MACs and
+         on the mEMAC (which supports both Clauses 22 and 45).
+
 endif # NETDEVICES