diff options
| author | Tom Rini <trini@konsulko.com> | 2021-09-16 17:29:40 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-09-16 17:29:40 +0300 |
| commit | 6674edaabfd271471608146806f5b6540bc76a1b (patch) | |
| tree | 574f8b5265002ad046aa1b81725a9483feb48a8d /drivers/net/Kconfig | |
| parent | 4f8bf67f9c7fec8c5c1ae57c6ba24d337a19c578 (diff) | |
| parent | bb92678ced0b1594b93ab2f10b2c17750c789c96 (diff) | |
| download | u-boot-6674edaabfd271471608146806f5b6540bc76a1b.tar.xz | |
Merge tag 'v2021.10-rc4' into next
Prepare v2021.10-rc4
Signed-off-by: Tom Rini <trini@konsulko.com>
# gpg: Signature made Tue 14 Sep 2021 06:58:32 PM EDT
# gpg: using RSA key 1A3C7F70E08FAB1707809BBF147C39FF9634B72C
# gpg: Good signature from "Thomas Rini <trini@konsulko.com>" [ultimate]
# Conflicts:
# board/Arcturus/ucp1020/spl.c
# cmd/mvebu/Kconfig
# common/Kconfig.boot
# common/image-fit.c
# configs/UCP1020_defconfig
# configs/sifive_unmatched_defconfig
# drivers/pci/Kconfig
# include/configs/UCP1020.h
# include/configs/sifive-unmatched.h
# lib/Makefile
# scripts/config_whitelist.txt
Diffstat (limited to 'drivers/net/Kconfig')
| -rw-r--r-- | drivers/net/Kconfig | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 8b1add19e8..6c12959f37 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -225,7 +225,6 @@ config DWC_ETH_QOS_TEGRA186 config E1000 bool "Intel PRO/1000 Gigabit Ethernet support" - depends on (DM_ETH && DM_PCI) || !DM_ETH help This driver supports Intel(R) PRO/1000 gigabit ethernet family of adapters. For more information on how to identify your adapter, go @@ -509,7 +508,7 @@ config OCTEONTX2_CGX_INTF config PCH_GBE bool "Intel Platform Controller Hub EG20T GMAC driver" - depends on DM_ETH && DM_PCI + depends on DM_ETH select PHYLIB help This MAC is present in Intel Platform Controller Hub EG20T. It @@ -608,7 +607,6 @@ source "drivers/net/ti/Kconfig" config TULIP bool "DEC Tulip DC2114x Ethernet support" - depends on (DM_ETH && DM_PCI) || !DM_ETH help This driver supports DEC DC2114x Fast ethernet chips. @@ -791,7 +789,7 @@ config HIGMACV300_ETH config FSL_ENETC bool "NXP ENETC Ethernet controller" - depends on DM_PCI && DM_ETH && DM_MDIO + depends on DM_ETH && DM_MDIO help This driver supports the NXP ENETC Ethernet controller found on some of the NXP SoCs. |