Merge tag 'uniphier-v2019.07' of git://git.denx.de/u-boot-uniphier

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

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 39ce4e8a1fc6151fb9934045a41b8184bc5bae01..d0e5426a99d88de3a4ba736bf11301679e876ecd 100644 (file)
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -156,12 +156,15 @@ config ETH_SANDBOX_RAW
 config ETH_DESIGNWARE
        bool "Synopsys Designware Ethernet MAC"
        select PHYLIB
+       imply ETH_DESIGNWARE_SOCFPGA if ARCH_SOCFPGA
        help
          This MAC is present in SoCs from various vendors. It supports
          100Mbit and 1 Gbit operation. You must enable CONFIG_PHYLIB to
          provide the PHY (physical media interface).
 
 config ETH_DESIGNWARE_SOCFPGA
+       select REGMAP
+       select SYSCON
        bool "Altera SoCFPGA extras for Synopsys Designware Ethernet MAC"
        depends on DM_ETH && ETH_DESIGNWARE
        help
@@ -187,7 +190,7 @@ config FEC_MXC_MDIO_BASE
 
 config FEC_MXC
        bool "FEC Ethernet controller"
-       depends on MX5 || MX6 || MX7 || IMX8
+       depends on MX5 || MX6 || MX7 || IMX8 || VF610
        help
          This driver supports the 10/100 Fast Ethernet controller for
          NXP i.MX processors.
@@ -432,12 +435,7 @@ config SNI_AVE
          This driver implements support for the Socionext AVE Ethernet
          controller, as found on the Socionext UniPhier family.
 
-config MSCC_OCELOT_SWITCH
-       bool "Ocelot switch driver"
-       depends on DM_ETH && ARCH_MSCC
-       select PHYLIB
-       help
-         This driver supports the Ocelot network switch device.
+source "drivers/net/mscc_eswitch/Kconfig"
 
 config ETHER_ON_FEC1
        bool "FEC1"