This fulfills the pending feature removal of the non-net multi code. At this point, only two net drivers and one board seem to still be using the !NET_MULTI code paths. So it's easy to scrub all of that.
As for the rest, my MAKEALL run didn't seem to indicate there were any problems due to my changes, but there were so many failures over all, that it's hard to tell exactly. Mike Frysinger (4): net: drop !NET_MULTI bcm570x/tigon3 drivers net: drop !NET_MULTI ns7520 driver net: drop !NET_MULTI code board configs: drop NET_MULTI references README | 8 +- api/api_net.c | 4 - arch/arm/include/asm/arch-kirkwood/config.h | 1 - arch/arm/lib/board.c | 2 - arch/avr32/lib/board.c | 2 - arch/m68k/lib/board.c | 2 - arch/mips/lib/board.c | 2 - arch/nios2/lib/board.c | 2 - arch/powerpc/cpu/mpc8220/fec.c | 3 +- arch/powerpc/cpu/mpc8260/ether_fcc.c | 3 +- arch/powerpc/cpu/mpc8260/ether_scc.c | 4 - arch/powerpc/cpu/mpc85xx/ether_fcc.c | 3 +- arch/powerpc/cpu/ppc4xx/miiphy.c | 7 +- arch/powerpc/include/asm/ppc4xx-emac.h | 1 - arch/powerpc/lib/board.c | 2 - arch/sparc/lib/board.c | 2 - arch/x86/lib/board.c | 2 - board/BuS/eb_cpux9k2/cpux9k2.c | 2 - board/cm-bf537e/cm-bf537e.c | 2 - board/cm-bf537u/cm-bf537u.c | 2 - board/evb64260/eth.c | 2 +- board/tcm-bf537/tcm-bf537.c | 2 - doc/README.m53017evb | 1 - doc/README.m5373evb | 1 - doc/README.m54455evb | 1 - doc/README.m5475evb | 1 - doc/README.usb | 1 - doc/feature-removal-schedule.txt | 19 - drivers/net/4xx_enet.c | 4 - drivers/net/5701rls.c | 46 - drivers/net/5701rls.h | 198 - drivers/net/Makefile | 7 - drivers/net/bcm570x.c | 1598 -------- drivers/net/bcm570x_autoneg.c | 439 -- drivers/net/bcm570x_autoneg.h | 408 -- drivers/net/bcm570x_bits.h | 57 - drivers/net/bcm570x_debug.h | 109 - drivers/net/bcm570x_lm.h | 434 -- drivers/net/bcm570x_mm.h | 158 - drivers/net/bcm570x_queue.h | 387 -- drivers/net/mcfmii.c | 4 +- drivers/net/mpc512x_fec.c | 5 - drivers/net/ns7520_eth.c | 850 ---- drivers/net/tigon3.c | 5697 --------------------------- drivers/net/tigon3.h | 3339 ---------------- include/configs/A3000.h | 1 - include/configs/ADCIOP.h | 1 - include/configs/AP1000.h | 1 - include/configs/APC405.h | 1 - include/configs/AR405.h | 1 - include/configs/ASH405.h | 1 - include/configs/Alaska8220.h | 1 - include/configs/BAB7xx.h | 1 - include/configs/BC3450.h | 1 - include/configs/BMW.h | 5 +- include/configs/CATcenter.h | 1 - include/configs/CMS700.h | 1 - include/configs/CPC45.h | 1 - include/configs/CPCI405.h | 1 - include/configs/CPCI4052.h | 1 - include/configs/CPCI405AB.h | 1 - include/configs/CPCI405DT.h | 1 - include/configs/CPCI750.h | 1 - include/configs/CPCIISER4.h | 1 - include/configs/CRAYL1.h | 1 - include/configs/CU824.h | 1 - include/configs/DASA_SIM.h | 1 - include/configs/DB64360.h | 1 - include/configs/DB64460.h | 1 - include/configs/DU405.h | 1 - include/configs/DU440.h | 1 - include/configs/EB+MCF-EV123.h | 1 - include/configs/ELPPC.h | 1 - include/configs/EVB64260.h | 1 - include/configs/EXBITGEN.h | 1 - include/configs/G2000.h | 1 - include/configs/HH405.h | 1 - include/configs/HIDDEN_DRAGON.h | 1 - include/configs/HUB405.h | 1 - include/configs/IceCube.h | 1 - include/configs/JSE.h | 1 - include/configs/KAREF.h | 1 - include/configs/M5208EVBE.h | 1 - include/configs/M5235EVB.h | 1 - include/configs/M5253DEMO.h | 1 - include/configs/M5271EVB.h | 1 - include/configs/M5272C3.h | 1 - include/configs/M5275EVB.h | 1 - include/configs/M5282EVB.h | 1 - include/configs/M53017EVB.h | 1 - include/configs/M5329EVB.h | 1 - include/configs/M5373EVB.h | 1 - include/configs/M54451EVB.h | 1 - include/configs/M54455EVB.h | 1 - include/configs/M5475EVB.h | 1 - include/configs/M5485EVB.h | 1 - include/configs/MERGERBOX.h | 1 - include/configs/METROBOX.h | 1 - include/configs/MIP405.h | 1 - include/configs/MOUSSE.h | 1 - include/configs/MPC8308RDB.h | 1 - include/configs/MPC8313ERDB.h | 1 - include/configs/MPC8315ERDB.h | 5 - include/configs/MPC8323ERDB.h | 6 - include/configs/MPC832XEMDS.h | 6 - include/configs/MPC8349EMDS.h | 4 - include/configs/MPC8349ITX.h | 2 - include/configs/MPC8360EMDS.h | 5 - include/configs/MPC8360ERDK.h | 6 - include/configs/MPC837XEMDS.h | 5 - include/configs/MPC837XERDB.h | 2 - include/configs/MPC8536DS.h | 5 - include/configs/MPC8540ADS.h | 5 - include/configs/MPC8541CDS.h | 5 - include/configs/MPC8544DS.h | 5 - include/configs/MPC8548CDS.h | 5 - include/configs/MPC8555CDS.h | 5 - include/configs/MPC8560ADS.h | 5 - include/configs/MPC8568MDS.h | 5 - include/configs/MPC8569MDS.h | 5 - include/configs/MPC8572DS.h | 5 - include/configs/MPC8610HPCD.h | 1 - include/configs/MPC8641HPCN.h | 5 - include/configs/MUSENKI.h | 1 - include/configs/MVBC_P.h | 1 - include/configs/MVBLM7.h | 1 - include/configs/MVBLUE.h | 1 - include/configs/MigoR.h | 1 - include/configs/NETPHONE.h | 1 - include/configs/NETTA.h | 1 - include/configs/NETTA2.h | 1 - include/configs/OCRTC.h | 1 - include/configs/ORSG.h | 1 - include/configs/OXC.h | 1 - include/configs/P1022DS.h | 2 - include/configs/P1023RDS.h | 5 - include/configs/P1_P2_RDB.h | 1 - include/configs/P2020DS.h | 5 - include/configs/P2041RDB.h | 1 - include/configs/P3G4.h | 1 - include/configs/PCIPPC2.h | 1 - include/configs/PCIPPC6.h | 1 - include/configs/PIP405.h | 1 - include/configs/PK1C20.h | 1 - include/configs/PLU405.h | 1 - include/configs/PM520.h | 1 - include/configs/PM826.h | 1 - include/configs/PM828.h | 1 - include/configs/PMC405.h | 1 - include/configs/PMC405DE.h | 1 - include/configs/PMC440.h | 1 - include/configs/PN62.h | 1 - include/configs/PPChameleonEVB.h | 1 - include/configs/SBC8540.h | 1 - include/configs/SIMPC8313.h | 1 - include/configs/Sandpoint8240.h | 1 - include/configs/Sandpoint8245.h | 1 - include/configs/TOP860.h | 1 - include/configs/TQM5200.h | 1 - include/configs/TQM834x.h | 4 - include/configs/TQM85xx.h | 1 - include/configs/TQM862L.h | 1 - include/configs/TQM862M.h | 1 - include/configs/Total5200.h | 1 - include/configs/VCMA9.h | 1 - include/configs/VOH405.h | 1 - include/configs/VOM405.h | 1 - include/configs/W7OLMC.h | 1 - include/configs/W7OLMG.h | 1 - include/configs/WUH405.h | 1 - include/configs/Yukon8220.h | 1 - include/configs/ZUMA.h | 1 - include/configs/a320evb.h | 1 - include/configs/a4m072.h | 1 - include/configs/actux1.h | 1 - include/configs/actux2.h | 1 - include/configs/actux3.h | 1 - include/configs/actux4.h | 1 - include/configs/aev.h | 1 - include/configs/afeb9260.h | 1 - include/configs/alpr.h | 1 - include/configs/amcc-common.h | 1 - include/configs/ap325rxa.h | 1 - include/configs/apollon.h | 1 - include/configs/aria.h | 1 - include/configs/at91rm9200ek.h | 1 - include/configs/at91sam9260ek.h | 1 - include/configs/at91sam9261ek.h | 1 - include/configs/at91sam9263ek.h | 1 - include/configs/at91sam9m10g45ek.h | 1 - include/configs/atc.h | 1 - include/configs/atngw100.h | 1 - include/configs/atstk1002.h | 1 - include/configs/atstk1006.h | 1 - include/configs/bct-brettl2.h | 1 - include/configs/bf518f-ezbrd.h | 1 - include/configs/bf526-ezbrd.h | 1 - include/configs/bf527-ezkit.h | 1 - include/configs/bf533-ezkit.h | 1 - include/configs/bf533-stamp.h | 1 - include/configs/bf537-minotaur.h | 1 - include/configs/bf537-pnav.h | 1 - include/configs/bf537-srv1.h | 1 - include/configs/bf537-stamp.h | 1 - include/configs/bf538f-ezkit.h | 1 - include/configs/bf548-ezkit.h | 1 - include/configs/bf561-acvilon.h | 1 - include/configs/bf561-ezkit.h | 1 - include/configs/blackstamp.h | 1 - include/configs/blackvme.h | 24 +- include/configs/ca9x4_ct_vxp.h | 2 - include/configs/cerf250.h | 1 - include/configs/cm-bf527.h | 1 - include/configs/cm-bf533.h | 1 - include/configs/cm-bf537e.h | 1 - include/configs/cm-bf537u.h | 1 - include/configs/cm-bf548.h | 1 - include/configs/cm-bf561.h | 1 - include/configs/cm4008.h | 1 - include/configs/cm41xx.h | 1 - include/configs/cm_t35.h | 1 - include/configs/cobra5272.h | 1 - include/configs/colibri_pxa270.h | 1 - include/configs/corenet_ds.h | 1 - include/configs/cpci5200.h | 1 - include/configs/cpu9260.h | 1 - include/configs/cpuat91.h | 1 - include/configs/cradle.h | 1 - include/configs/csb226.h | 1 - include/configs/csb272.h | 1 - include/configs/csb472.h | 1 - include/configs/da830evm.h | 1 - include/configs/da850evm.h | 1 - include/configs/davinci_dm355evm.h | 1 - include/configs/davinci_dm355leopard.h | 1 - include/configs/davinci_dm365evm.h | 1 - include/configs/davinci_dm6467evm.h | 1 - include/configs/davinci_dvevm.h | 1 - include/configs/davinci_schmoogie.h | 1 - include/configs/davinci_sffsdr.h | 1 - include/configs/davinci_sonata.h | 1 - include/configs/dbau1x00.h | 1 - include/configs/debris.h | 1 - include/configs/devkit8000.h | 1 - include/configs/dig297.h | 1 - include/configs/dnp5370.h | 1 - include/configs/dvlhost.h | 1 - include/configs/eNET.h | 1 - include/configs/eXalion.h | 1 - include/configs/ea20.h | 1 - include/configs/eb_cpux9k2.h | 1 - include/configs/edminiv2.h | 1 - include/configs/ep8248.h | 1 - include/configs/ep82xxm.h | 1 - include/configs/espt.h | 1 - include/configs/favr-32-ezkit.h | 1 - include/configs/gplugd.h | 1 - include/configs/gr_cpci_ax2000.h | 1 - include/configs/gr_ep2s60.h | 2 - include/configs/gr_xc3s_1500.h | 1 - include/configs/grasshopper.h | 1 - include/configs/grsim.h | 1 - include/configs/grsim_leon2.h | 1 - include/configs/gth2.h | 1 - include/configs/hammerhead.h | 1 - include/configs/hawkboard.h | 1 - include/configs/ibf-dsp561.h | 1 - include/configs/idmr.h | 1 - include/configs/igep0020.h | 1 - include/configs/imx27lite-common.h | 1 - include/configs/imx31_litekit.h | 1 - include/configs/imx31_phycore.h | 1 - include/configs/incaip.h | 1 - include/configs/innokom.h | 1 - include/configs/integratorap.h | 2 - include/configs/integratorcp.h | 1 - include/configs/ip04.h | 1 - include/configs/ipek01.h | 1 - include/configs/jadecpu.h | 1 - include/configs/jupiter.h | 1 - include/configs/km/km82xx-common.h | 1 - include/configs/km/km83xx-common.h | 3 - include/configs/km/km_arm.h | 1 - include/configs/korat.h | 1 - include/configs/kvme080.h | 1 - include/configs/linkstation.h | 1 - include/configs/lubbock.h | 1 - include/configs/lwmon5.h | 1 - include/configs/mecp5123.h | 1 - include/configs/mecp5200.h | 1 - include/configs/meesc.h | 1 - include/configs/microblaze-generic.h | 2 - include/configs/mimc200.h | 1 - include/configs/mpc5121ads.h | 1 - include/configs/mpc7448hpc2.h | 1 - include/configs/mpc8308_p1m.h | 1 - include/configs/mpq101.h | 4 - include/configs/ms7722se.h | 1 - include/configs/mx1ads.h | 1 - include/configs/mx25pdk.h | 1 - include/configs/mx31ads.h | 1 - include/configs/mx31pdk.h | 1 - include/configs/mx35pdk.h | 1 - include/configs/mx51evk.h | 1 - include/configs/mx53ard.h | 1 - include/configs/mx53evk.h | 1 - include/configs/mx53loco.h | 1 - include/configs/mx53smd.h | 1 - include/configs/nhk8815.h | 1 - include/configs/nios2-generic.h | 1 - include/configs/o2dnt.h | 1 - include/configs/omap1510inn.h | 1 - include/configs/omap1610h2.h | 1 - include/configs/omap1610inn.h | 1 - include/configs/omap2420h4.h | 1 - include/configs/omap3_beagle.h | 1 - include/configs/omap3_evm.h | 1 - include/configs/omap3_overo.h | 1 - include/configs/omap3_sdp3430.h | 1 - include/configs/omap5912osk.h | 1 - include/configs/omap730p2.h | 1 - include/configs/otc570.h | 1 - include/configs/p3mx.h | 1 - include/configs/p3p440.h | 1 - include/configs/pb1x00.h | 1 - include/configs/pcs440ep.h | 1 - include/configs/pdm360ng.h | 1 - include/configs/pdnb3.h | 1 - include/configs/pf5200.h | 1 - include/configs/pleb2.h | 1 - include/configs/pm9261.h | 1 - include/configs/pm9263.h | 1 - include/configs/pm9g45.h | 1 - include/configs/ppmc7xx.h | 2 - include/configs/pxa255_idp.h | 1 - include/configs/qemu-mips.h | 2 - include/configs/qong.h | 1 - include/configs/quad100hd.h | 1 - include/configs/r2dplus.h | 1 - include/configs/r7780mp.h | 1 - include/configs/rsk7203.h | 1 - include/configs/rsk7264.h | 1 - include/configs/sbc35_a9g20.h | 1 - include/configs/sbc405.h | 1 - include/configs/sbc8349.h | 4 - include/configs/sbc8548.h | 5 - include/configs/sbc8560.h | 4 - include/configs/sbc8641d.h | 5 - include/configs/sc3.h | 1 - include/configs/scb9328.h | 1 - include/configs/sh7757lcr.h | 1 - include/configs/sh7763rdp.h | 1 - include/configs/sh7785lcr.h | 1 - include/configs/smdk2410.h | 1 - include/configs/smdk6400.h | 1 - include/configs/smdkc100.h | 1 - include/configs/smdkv310.h | 1 - include/configs/snapper9260.h | 1 - include/configs/socrates.h | 1 - include/configs/sorcery.h | 1 - include/configs/spieval.h | 1 - include/configs/stxgp3.h | 5 - include/configs/stxssa.h | 5 - include/configs/stxxtc.h | 1 - include/configs/tb0229.h | 1 - include/configs/tcm-bf518.h | 1 - include/configs/tcm-bf537.h | 1 - include/configs/top9000.h | 1 - include/configs/trizepsiv.h | 1 - include/configs/tx25.h | 1 - include/configs/utx8245.h | 1 - include/configs/vct.h | 1 - include/configs/ve8313.h | 1 - include/configs/versatile.h | 1 - include/configs/vision2.h | 1 - include/configs/vme8349.h | 10 - include/configs/vpac270.h | 1 - include/configs/xaeniax.h | 1 - include/configs/xm250.h | 1 - include/configs/xpedite1000.h | 1 - include/configs/xpedite517x.h | 1 - include/configs/xpedite520x.h | 1 - include/configs/xpedite537x.h | 1 - include/configs/xpedite550x.h | 1 - include/configs/zeus.h | 1 - include/configs/zmx25.h | 1 - include/net.h | 40 - include/ns7520_eth.h | 336 -- net/eth.c | 53 +- net/net.c | 30 - net/nfs.c | 2 - net/tftp.c | 4 - 392 files changed, 35 insertions(+), 14752 deletions(-) delete mode 100644 drivers/net/5701rls.c delete mode 100644 drivers/net/5701rls.h delete mode 100644 drivers/net/bcm570x.c delete mode 100644 drivers/net/bcm570x_autoneg.c delete mode 100644 drivers/net/bcm570x_autoneg.h delete mode 100644 drivers/net/bcm570x_bits.h delete mode 100644 drivers/net/bcm570x_debug.h delete mode 100644 drivers/net/bcm570x_lm.h delete mode 100644 drivers/net/bcm570x_mm.h delete mode 100644 drivers/net/bcm570x_queue.h delete mode 100644 drivers/net/ns7520_eth.c delete mode 100644 drivers/net/tigon3.c delete mode 100644 drivers/net/tigon3.h delete mode 100644 include/ns7520_eth.h -- 1.7.6.1 _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot