diff options
author | Tom Rini <trini@konsulko.com> | 2022-04-15 15:09:52 +0300 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2022-04-15 15:10:32 +0300 |
commit | 7f418ea59852945eeb9e5d2555d306f09643d555 (patch) | |
tree | 069dbaf3a1f62b68251189e9acdbd9affcbd98c5 /scripts | |
parent | 239fe55a6ce516f329687c0680428ca2acfc73ca (diff) | |
parent | 0154e6de37e8bbaac837939391f6d4a8f0b3fd18 (diff) | |
download | u-boot-7f418ea59852945eeb9e5d2555d306f09643d555.tar.xz |
Merge branch 'next' of https://source.denx.de/u-boot/custodians/u-boot-net
- DM9000 DM support
- tftp server bug fix
- mdio ofnode support functions
- Various phy fixes and improvements.
[trini: Fixup merge conflicts in drivers/net/phy/ethernet_id.c
drivers/net/phy/phy.c include/phy.h]
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/config_whitelist.txt | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index ef7dbbfe98..df70ae2264 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -25,7 +25,6 @@ CONFIG_DM9000_DEBUG CONFIG_DM9000_NO_SROM CONFIG_DM9000_USE_16BIT CONFIG_DP_DDR_DIMM_SLOTS_PER_CTLR -CONFIG_DRIVER_DM9000 CONFIG_DSP_CLUSTER_START CONFIG_DWC_AHSATA_BASE_ADDR CONFIG_DWC_AHSATA_PORT_ID |