Merge tag 'tpm-030822' of https://source.denx.de/u-boot/custodians/u-boot-tpm

[platform/kernel/u-boot.git] / drivers / net / Kconfig

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index cb891f5..93e7dbe 100644 (file)
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -349,7 +349,7 @@ config FEC_MXC_MDIO_BASE
 
 config FEC_MXC
        bool "FEC Ethernet controller"
-       depends on MX28 || MX5 || MX6 || MX7 || IMX8 || IMX8M || IMX8ULP || VF610
+       depends on MX28 || MX5 || MX6 || MX7 || IMX8 || IMX8M || IMX8ULP || IMX93 || VF610
        help
          This driver supports the 10/100 Fast Ethernet controller for
          NXP i.MX processors.
@@ -357,6 +357,9 @@ config FEC_MXC
 config FMAN_ENET
        bool "Freescale FMan ethernet support"
        depends on ARM || PPC
+       select SYS_FMAN_V3 if ARCH_B4420 || ARCH_B4860 || ARCH_LS1043A || \
+               ARCH_LS1046A || ARCH_T1024 || ARCH_T1040 || ARCH_T1042 || \
+               ARCH_T2080 || ARCH_T4240
        help
          This driver support the Freescale FMan Ethernet controller
 
@@ -370,6 +373,12 @@ config SYS_QE_FMAN_FW_LENGTH
        depends on FMAN_ENET || QE || U_QE
        default 0x10000
 
+config SYS_FMAN_V3
+       bool
+       select FSL_MEMAC
+       help
+         SoC has FMan v3 with mEMAC
+
 config FTMAC100
        bool "Ftmac100 Ethernet Support"
        help
@@ -400,11 +409,14 @@ config FTGMAC100
          offers high-priority transmit queue for QoS and CoS
          applications.
 
+config SYS_DISCOVER_PHY
+       bool
 
 config MCFFEC
        bool "ColdFire Ethernet Support"
        depends on DM_ETH
        select PHYLIB
+       select SYS_DISCOVER_PHY
        help
          This driver supports the network interface units in the
          ColdFire family.
@@ -417,6 +429,7 @@ config FSLDMAFEC
         bool "ColdFire DMA Ethernet Support"
        depends on DM_ETH
        select PHYLIB
+       select SYS_DISCOVER_PHY
        help
          This driver supports the network interface units in the
          ColdFire family.
@@ -732,6 +745,7 @@ config MPC8XX_FEC
        bool "Fast Ethernet Controller on MPC8XX"
        depends on MPC8xx
        select MII
+       select SYS_DISCOVER_PHY
        help
          This driver implements support for the Fast Ethernet Controller
          on MPC8XX