Merge branch 'next' of https://source.denx.de/u-boot/custodians/u-boot-net
authorTom Rini <trini@konsulko.com>
Fri, 15 Apr 2022 12:09:52 +0000 (08:09 -0400)
committerTom Rini <trini@konsulko.com>
Fri, 15 Apr 2022 12:10:32 +0000 (08:10 -0400)
commit7f418ea59852945eeb9e5d2555d306f09643d555
tree069dbaf3a1f62b68251189e9acdbd9affcbd98c5
parent239fe55a6ce516f329687c0680428ca2acfc73ca
parent0154e6de37e8bbaac837939391f6d4a8f0b3fd18
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]
18 files changed:
configs/M5253DEMO_defconfig
configs/at91sam9261ek_dataflash_cs0_defconfig
configs/at91sam9261ek_dataflash_cs3_defconfig
configs/at91sam9261ek_nandflash_defconfig
configs/ci20_mmc_defconfig
configs/colibri_pxa270_defconfig
drivers/net/dwc_eth_qos.c
drivers/net/phy/Kconfig
drivers/net/phy/Makefile
drivers/net/phy/ethernet_id.c
drivers/net/phy/phy.c
drivers/net/sun8i_emac.c
drivers/net/sunxi_emac.c
drivers/net/zynq_gem.c
include/configs/colibri_pxa270.h
include/dm/ofnode.h
include/phy.h
scripts/config_whitelist.txt