Pull request - NET
Wolfgang,
The following changes since commit e99e9575bbeba1b7c48e046547cae065ec0071de:
Wolfgang Denk (1):
Merge branch 'Makefile' of git://git.denx.de/u-boot-arm
are available in the git repository at:
git://git.denx.de/u-boot-net.git master
Andy Fleming (6):
tsec: Move tsec.h to include/
Pass in tsec_info struct through tsec_initialize Add SGMII support to the tsec
Add support for Freescale SGMII Riser Card Add SGMII support for the 8544 DS
Add pixis_set_sgmii command
Ben Warren (17):
Introduce netdev.h header file and remove externs
Moved initialization of Ethernet controllers on Atmel AT91 to board_eth_init() Moved initialization of RTL8169 Ethernet controller to board_eth_init() Moved initialization of RTL8139 Ethernet controller to board_eth_init() Moved initialization of TSI108 Ethernet controller to board_eth_init() Moved initialization of NS8382X Ethernet controller to board_eth_init() Moved initialization of NATSEMI Ethernet controller to board_eth_init() Moved initialization of PCNET Ethernet controller to board_eth_init() Moved initialization of GT6426x Ethernet controller to board_eth_init() Moved initialization of 3COM Ethernet controller (AmigaOne) to board_eth_init() Moved initialization of IncaIP Ethernet controller to board_eth_init Moved initialization of MPC512x_FEC Ethernet driver to CPU directory Moved initialization of MPC5xxx_FEC Ethernet driver to CPU directory Moved initialization of plb2800 Ethernet driver to board_eth_init Moved initialization of E1000 Ethernet controller to board_eth_init() Moved initialization of TULIP Ethernet controller to board_eth_init() Moved initialization of EEPRO100 Ethernet controller to board_eth_init()
Jochen Friedrich (1):
Don't tftp to unknown flash
Nobuhiro Iwamatsu (1):
net: smc911x: Add pkt_data_pull and pkt_data_push function
Sergei Poselenov (1):
PHY: Add support for the M88E1121R Marvell chip.
board/MAI/AmigaOneG3SE/AmigaOneG3SE.c | 9 +
board/MAI/AmigaOneG3SE/enet.c | 1 +
board/Marvell/db64360/db64360.c | 6 +
board/Marvell/db64460/db64460.c | 6 +
board/a3000/a3000.c | 7 +
board/amcc/katmai/katmai.c | 6 +
board/amcc/taihu/taihu.c | 6 +
board/amcc/taishan/taishan.c | 6 +
board/amcc/yucca/yucca.c | 6 +
board/amirix/ap1000/ap1000.c | 7 +
board/atmel/at91cap9adk/at91cap9adk.c | 11 ++
board/atmel/at91sam9260ek/at91sam9260ek.c | 11 ++
board/atmel/at91sam9263ek/at91sam9263ek.c | 11 ++
board/atmel/atngw100/atngw100.c | 3 +-
board/atmel/atstk1000/atstk1000.c | 3 +-
board/bc3450/bc3450.c | 7 +
board/bf537-stamp/bf537-stamp.c | 3 +-
board/cpc45/cpc45.c | 6 +
board/cpu87/cpu87.c | 6 +
board/cu824/cu824.c | 6 +
board/eXalion/eXalion.c | 6 +
board/earthlcd/favr-32-ezkit/favr-32-ezkit.c | 3 +-
board/eltec/bab7xx/bab7xx.c | 6 +
board/eltec/elppc/elppc.c | 6 +
board/esd/adciop/adciop.c | 6 +
board/esd/cpci5200/cpci5200.c | 6 +
board/esd/dasa_sim/dasa_sim.c | 6 +
board/esd/mecp5200/mecp5200.c | 6 +
board/esd/pf5200/pf5200.c | 6 +
board/etin/debris/debris.c | 6 +
board/etin/kvme080/kvme080.c | 6 +
board/evb64260/eth.c | 1 +
board/evb64260/evb64260.c | 8 +-
board/freescale/common/Makefile | 1 +
board/freescale/common/pixis.c | 55 ++++++
board/freescale/common/sgmii_riser.c | 26 +++
board/freescale/common/sgmii_riser.h | 15 ++
board/freescale/mpc7448hpc2/mpc7448hpc2.c | 10 +
board/freescale/mpc8315erdb/mpc8315erdb.c | 7 +
board/freescale/mpc8544ds/mpc8544ds.c | 39 ++++
board/freescale/mpc8610hpcd/mpc8610hpcd.c | 8 +-
board/freescale/mpc8641hpcn/mpc8641hpcn.c | 8 +
board/hidden_dragon/hidden_dragon.c | 6 +
board/icecube/icecube.c | 7 +
board/incaip/incaip.c | 8 +
board/integratorap/integratorap.c | 7 +
board/ixdp425/ixdp425.c | 6 +
board/linkstation/linkstation.c | 6 +
board/matrix_vision/mvbc_p/mvbc_p.c | 7 +
board/mimc/mimc200/mimc200.c | 3 +-
board/miromico/hammerhead/hammerhead.c | 3 +-
board/mousse/mousse.c | 6 +
board/mpc8540eval/mpc8540eval.c | 12 ++
board/musenki/musenki.c | 6 +
board/mvblue/mvblue.c | 6 +
board/o2dnt/o2dnt.c | 7 +
board/oxc/oxc.c | 6 +
board/pcippc2/pcippc2.c | 6 +
board/pm520/pm520.c | 7 +
board/pm826/pm826.c | 6 +
board/pm828/pm828.c | 6 +
board/pm854/pm854.c | 7 +
board/pm856/pm856.c | 7 +
board/pn62/pn62.c | 6 +
board/ppmc7xx/ppmc7xx.c | 6 +
board/purple/purple.c | 9 +
board/r2dplus/r2dplus.c | 5 +
board/r7780mp/r7780mp.c | 6 +
board/sandpoint/sandpoint.c | 6 +
board/sbc8240/sbc8240.c | 6 +
board/sc3/sc3.c | 6 +
board/sc520_cdp/sc520_cdp.c | 6 +
board/sc520_spunk/sc520_spunk.c | 6 +
board/sl8245/sl8245.c | 3 +-
board/sorcery/sorcery.c | 6 +
board/stxssa/stxssa.c | 8 +
board/tb0229/tb0229.c | 5 +
board/total5200/total5200.c | 7 +
board/tqc/tqm5200/tqm5200.c | 7 +
board/tqc/tqm8272/tqm8272.c | 6 +
board/tqc/tqm85xx/tqm85xx.c | 7 +
board/utx8245/utx8245.c | 6 +
cpu/arm926ejs/at91/Makefile | 1 -
cpu/arm926ejs/at91/ether.c | 35 ----
cpu/leon2/cpu.c | 3 +-
cpu/leon3/cpu.c | 2 +-
cpu/mcf523x/cpu.c | 3 +-
cpu/mcf52x2/cpu.c | 3 +-
cpu/mcf532x/cpu.c | 3 +-
cpu/mcf5445x/cpu.c | 3 +-
cpu/mcf547x_8x/cpu.c | 4 +-
cpu/mpc512x/cpu.c | 13 ++
cpu/mpc5xxx/cpu.c | 13 ++
cpu/mpc83xx/cpu.c | 20 +--
cpu/mpc85xx/cpu.c | 33 +---
cpu/mpc86xx/cpu.c | 26 +--
drivers/net/bfin_mac.c | 1 +
drivers/net/dc2114x.c | 1 +
drivers/net/e1000.c | 2 +-
drivers/net/e1000.h | 1 +
drivers/net/eepro100.c | 1 +
drivers/net/greth.c | 1 +
drivers/net/inca-ip_sw.c | 3 +-
drivers/net/macb.c | 1 +
drivers/net/mcffec.c | 1 +
drivers/net/mpc512x_fec.c | 1 +
drivers/net/mpc5xxx_fec.c | 1 +
drivers/net/natsemi.c | 1 +
drivers/net/ns8382x.c | 1 +
drivers/net/pcnet.c | 1 +
drivers/net/plb2800_eth.c | 5 +-
drivers/net/rtl8139.c | 1 +
drivers/net/rtl8169.c | 1 +
drivers/net/sk98lin/uboot_drv.c | 1 +
drivers/net/smc911x.c | 9 +-
drivers/net/tsec.c | 244 ++++++++++++++++----------
drivers/net/tsi108_eth.c | 1 +
drivers/net/uli526x.c | 1 +
include/configs/MPC8544DS.h | 8 +
include/netdev.h | 110 ++++++++++++
{drivers/net => include}/tsec.h | 68 +++++++-
net/eth.c | 69 -------
net/tftp.c | 2 +
123 files changed, 1018 insertions(+), 301 deletions(-)
create mode 100644 board/freescale/common/sgmii_riser.c
create mode 100644 board/freescale/common/sgmii_riser.h
delete mode 100644 cpu/arm926ejs/at91/ether.c
create mode 100644 include/netdev.h
rename {drivers/net => include}/tsec.h (91%)Wolfgang Denk
AppliedDear Ben Warren,
Quoted 167 lines · In message <[email protected]> you wrote:
Wolfgang,
The following changes since commit
e99e9575bbeba1b7c48e046547cae065ec0071de:
Wolfgang Denk (1):
Merge branch 'Makefile' ofgit://git.denx.de/u-boot-armare available in the git repository at:
git://git.denx.de/u-boot-net.gitmasterAndy Fleming (6):
tsec: Movetsec.htoinclude/
Pass intsec_infostruct throughtsec_initializeAdd SGMII support to the tsec
Add support for Freescale SGMII Riser Card Add SGMII support for the 8544 DS
Addpixis_set_sgmiicommandBen Warren (17):
Introducenetdev.hheader file and remove externs
Moved initialization of Ethernet controllers on Atmel AT91 toboard_eth_init()Moved initialization of RTL8169 Ethernet controller toboard_eth_init()Moved initialization of RTL8139 Ethernet controller toboard_eth_init()Moved initialization of TSI108 Ethernet controller toboard_eth_init()Moved initialization of NS8382X Ethernet controller toboard_eth_init()Moved initialization of NATSEMI Ethernet controller toboard_eth_init()Moved initialization of PCNET Ethernet controller toboard_eth_init()Moved initialization of GT6426x Ethernet controller toboard_eth_init()Moved initialization of 3COM Ethernet controller (AmigaOne) toboard_eth_init()Moved initialization of IncaIP Ethernet controller toboard_eth_initMoved initialization ofMPC512x_FECEthernet driver to CPU directory Moved initialization ofMPC5xxx_FECEthernet driver to CPU directory Moved initialization of plb2800 Ethernet driver toboard_eth_initMoved initialization of E1000 Ethernet controller toboard_eth_init()Moved initialization of TULIP Ethernet controller toboard_eth_init()Moved initialization of EEPRO100 Ethernet controller toboard_eth_init()Jochen Friedrich (1):
Don't tftp to unknown flashNobuhiro Iwamatsu (1):
net: smc911x: Addpkt_data_pullandpkt_data_pushfunctionSergei Poselenov (1):
PHY: Add support for the M88E1121R Marvell chip.board/MAI/AmigaOneG3SE/AmigaOneG3SE.c | 9 + board/MAI/AmigaOneG3SE/enet.c | 1 + board/Marvell/db64360/db64360.c | 6 + board/Marvell/db64460/db64460.c | 6 + board/a3000/a3000.c | 7 + board/amcc/katmai/katmai.c | 6 + board/amcc/taihu/taihu.c | 6 + board/amcc/taishan/taishan.c | 6 + board/amcc/yucca/yucca.c | 6 + board/amirix/ap1000/ap1000.c | 7 + board/atmel/at91cap9adk/at91cap9adk.c | 11 ++ board/atmel/at91sam9260ek/at91sam9260ek.c | 11 ++ board/atmel/at91sam9263ek/at91sam9263ek.c | 11 ++ board/atmel/atngw100/atngw100.c | 3 +- board/atmel/atstk1000/atstk1000.c | 3 +- board/bc3450/bc3450.c | 7 + board/bf537-stamp/bf537-stamp.c | 3 +- board/cpc45/cpc45.c | 6 + board/cpu87/cpu87.c | 6 + board/cu824/cu824.c | 6 + board/eXalion/eXalion.c | 6 + board/earthlcd/favr-32-ezkit/favr-32-ezkit.c | 3 +- board/eltec/bab7xx/bab7xx.c | 6 + board/eltec/elppc/elppc.c | 6 + board/esd/adciop/adciop.c | 6 + board/esd/cpci5200/cpci5200.c | 6 + board/esd/dasa_sim/dasa_sim.c | 6 + board/esd/mecp5200/mecp5200.c | 6 + board/esd/pf5200/pf5200.c | 6 + board/etin/debris/debris.c | 6 + board/etin/kvme080/kvme080.c | 6 + board/evb64260/eth.c | 1 + board/evb64260/evb64260.c | 8 +- board/freescale/common/Makefile | 1 + board/freescale/common/pixis.c | 55 ++++++ board/freescale/common/sgmii_riser.c | 26 +++ board/freescale/common/sgmii_riser.h | 15 ++ board/freescale/mpc7448hpc2/mpc7448hpc2.c | 10 + board/freescale/mpc8315erdb/mpc8315erdb.c | 7 + board/freescale/mpc8544ds/mpc8544ds.c | 39 ++++ board/freescale/mpc8610hpcd/mpc8610hpcd.c | 8 +- board/freescale/mpc8641hpcn/mpc8641hpcn.c | 8 + board/hidden_dragon/hidden_dragon.c | 6 + board/icecube/icecube.c | 7 + board/incaip/incaip.c | 8 + board/integratorap/integratorap.c | 7 + board/ixdp425/ixdp425.c | 6 + board/linkstation/linkstation.c | 6 + board/matrix_vision/mvbc_p/mvbc_p.c | 7 + board/mimc/mimc200/mimc200.c | 3 +- board/miromico/hammerhead/hammerhead.c | 3 +- board/mousse/mousse.c | 6 + board/mpc8540eval/mpc8540eval.c | 12 ++ board/musenki/musenki.c | 6 + board/mvblue/mvblue.c | 6 + board/o2dnt/o2dnt.c | 7 + board/oxc/oxc.c | 6 + board/pcippc2/pcippc2.c | 6 + board/pm520/pm520.c | 7 + board/pm826/pm826.c | 6 + board/pm828/pm828.c | 6 + board/pm854/pm854.c | 7 + board/pm856/pm856.c | 7 + board/pn62/pn62.c | 6 + board/ppmc7xx/ppmc7xx.c | 6 + board/purple/purple.c | 9 + board/r2dplus/r2dplus.c | 5 + board/r7780mp/r7780mp.c | 6 + board/sandpoint/sandpoint.c | 6 + board/sbc8240/sbc8240.c | 6 + board/sc3/sc3.c | 6 + board/sc520_cdp/sc520_cdp.c | 6 + board/sc520_spunk/sc520_spunk.c | 6 + board/sl8245/sl8245.c | 3 +- board/sorcery/sorcery.c | 6 + board/stxssa/stxssa.c | 8 + board/tb0229/tb0229.c | 5 + board/total5200/total5200.c | 7 + board/tqc/tqm5200/tqm5200.c | 7 + board/tqc/tqm8272/tqm8272.c | 6 + board/tqc/tqm85xx/tqm85xx.c | 7 + board/utx8245/utx8245.c | 6 + cpu/arm926ejs/at91/Makefile | 1 - cpu/arm926ejs/at91/ether.c | 35 ---- cpu/leon2/cpu.c | 3 +- cpu/leon3/cpu.c | 2 +- cpu/mcf523x/cpu.c | 3 +- cpu/mcf52x2/cpu.c | 3 +- cpu/mcf532x/cpu.c | 3 +- cpu/mcf5445x/cpu.c | 3 +- cpu/mcf547x_8x/cpu.c | 4 +- cpu/mpc512x/cpu.c | 13 ++ cpu/mpc5xxx/cpu.c | 13 ++ cpu/mpc83xx/cpu.c | 20 +-- cpu/mpc85xx/cpu.c | 33 +--- cpu/mpc86xx/cpu.c | 26 +-- drivers/net/bfin_mac.c | 1 + drivers/net/dc2114x.c | 1 + drivers/net/e1000.c | 2 +- drivers/net/e1000.h | 1 + drivers/net/eepro100.c | 1 + drivers/net/greth.c | 1 + drivers/net/inca-ip_sw.c | 3 +- drivers/net/macb.c | 1 + drivers/net/mcffec.c | 1 + drivers/net/mpc512x_fec.c | 1 + drivers/net/mpc5xxx_fec.c | 1 + drivers/net/natsemi.c | 1 + drivers/net/ns8382x.c | 1 + drivers/net/pcnet.c | 1 + drivers/net/plb2800_eth.c | 5 +- drivers/net/rtl8139.c | 1 + drivers/net/rtl8169.c | 1 + drivers/net/sk98lin/uboot_drv.c | 1 + drivers/net/smc911x.c | 9 +- drivers/net/tsec.c | 244 ++++++++++++++++---------- drivers/net/tsi108_eth.c | 1 + drivers/net/uli526x.c | 1 + include/configs/MPC8544DS.h | 8 + include/netdev.h | 110 ++++++++++++ {drivers/net => include}/tsec.h | 68 +++++++-
Quoted 8 lines
net/eth.c | 69 -------
net/tftp.c | 2 +
123 files changed, 1018 insertions(+), 301 deletions(-)
create mode 100644 board/freescale/common/sgmii_riser.c
create mode 100644 board/freescale/common/sgmii_riser.h
delete mode 100644 cpu/arm926ejs/at91/ether.c
create mode 100644 include/netdev.h
rename {drivers/net => include}/tsec.h (91%)Applied, thank.
Best regards,
Wolfgang Denk
Signature · 7 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de ... The things love can drive a man to -- the ecstasies, the mise- ries, the broken rules, the desperate chances, the glorious failures and the glorious victories. -- McCoy, "Requiem for Methuselah", stardate 5843.7