From mboxrd@z Thu Jan 1 00:00:00 1970 From: Joe Hershberger Date: Mon, 24 Jun 2013 19:21:25 -0500 Subject: [U-Boot] Pull request: u-boot-net.git master Message-ID: List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de The following changes since commit 348e47f766ac228fb02d1af562b2e9a4c69355db: Merge branch 'master' of git://git.denx.de/u-boot-arm (2013-06-22 07:38:12 -0400) are available in the git repository at: git://git.denx.de/u-boot-net.git master for you to fetch changes up to 433a2c5325b982b49b099e526d373d07d0cc5e97: phylib: add atheros ar803x phy (2013-06-24 19:11:17 -0500) ---------------------------------------------------------------- Bo Shen (5): checkpatch: add ignore for network block comment style checking ARM: at91sam9n12: add network support with ksz8851_16mll net: macb: using AT91FAMILY replace #ifdeferry net: macb: using phylib to configure phy device net: macb: add support for gigabit MAC Charles Coldwell (1): add support for Xilinx 1000BASE-X phy (GTX) David Andrey (1): PHY: micrel.c: add support for KSZ9031 Heiko Schocher (2): phylib: add natsemi dp83630 phy phylib: add atheros ar803x phy Henrik Nordstr?m (1): net: Add sunxi (Allwinner) wemac driver Joe Hershberger (3): net: Fix build regression in cmd_pxe.c net: Fix build regression in macb.c net: Correct check for link-local target IP conflict Kim Phillips (2): net: make IPaddr type big endian net/tftp: sparse fixes Kuo-Jung Su (2): net: add Faraday FTMAC110 10/100Mbps ethernet support net: update FTGMAC100 for MMU/D-cache support Matthias Brugger (1): net: nfs: add dynamic wait period Rob Herring (10): pxe: Use ethact setting for pxe pxe: make string parameters const pxe: fix handling of different localboot values bootz: un-staticize do_bootz pxe: try bootz if bootm fails to find a valid image pxe: always display a menu when present pxe: simplify menu display and selection pxe: add support for ontimeout token pxe: add support for per arch and SoC default paths pxe: add ipappend support Roberto Cerati (1): net: ks8851_mll: add ethernet support SARTRE Leo (1): net: phy: supplement support for Micrel's KSZ9031 Sebastian Hesselbarth (3): NET: phy: add 88E1310 PHY initialization NET: mvgbe: add phylib support NET: mvgbe: add support for Dove Shiraz Hashim (1): net/macb: Add arch specific routine to get mdio control Vipin Kumar (1): net/designware: Do not select MIIPORT for RGMII interface Xie Xiaobo (1): phylib: Add Atheros AR8035 GETH PHY support Yegor Yefremov (2): phy: export genphy_parse_link() net: add ICPlus PHY driver .checkpatch.conf | 3 + board/atmel/at91sam9n12ek/at91sam9n12ek.c | 36 ++ common/cmd_bootm.c | 2 +- common/cmd_pxe.c | 221 ++++++---- drivers/net/Makefile | 3 + drivers/net/designware.c | 4 +- drivers/net/ftgmac100.c | 70 +++- drivers/net/ftmac110.c | 473 ++++++++++++++++++++++ drivers/net/ftmac110.h | 177 ++++++++ drivers/net/ks8851_mll.c | 645 ++++++++++++++++++++++++++++++ drivers/net/ks8851_mll.h | 357 +++++++++++++++++ drivers/net/macb.c | 185 +++++++-- drivers/net/macb.h | 55 ++- drivers/net/mvgbe.c | 71 +++- drivers/net/mvgbe.h | 7 + drivers/net/phy/Makefile | 1 + drivers/net/phy/atheros.c | 45 ++- drivers/net/phy/icplus.c | 94 +++++ drivers/net/phy/marvell.c | 48 +++ drivers/net/phy/micrel.c | 113 ++++-- drivers/net/phy/natsemi.c | 37 ++ drivers/net/phy/phy.c | 26 +- drivers/net/sunxi_wemac.c | 533 ++++++++++++++++++++++++ include/command.h | 2 + include/configs/at91sam9n12ek.h | 4 + include/linux/ethtool.h | 4 + include/linux/mii.h | 2 + include/micrel.h | 11 + include/net.h | 2 +- include/netdev.h | 3 + include/phy.h | 1 + net/link_local.c | 17 +- net/nfs.c | 74 +++- net/tftp.c | 12 +- 34 files changed, 3117 insertions(+), 221 deletions(-) create mode 100644 drivers/net/ftmac110.c create mode 100644 drivers/net/ftmac110.h create mode 100644 drivers/net/ks8851_mll.c create mode 100644 drivers/net/ks8851_mll.h create mode 100644 drivers/net/phy/icplus.c create mode 100644 drivers/net/sunxi_wemac.c