Folks,

This last abusive patch set finally kills off CONFIG_COMMANDS and its partner in crime, CONFIG_BOOTP_MASK. Basically, all of these patches plus the preceeding 18 have to be incorporated together to really get a valid world again. Sorry it's so gross.

After these patches are applied, one simply uses the symbols CONFIG_CMD_* or CONFIG_BOOTP_* in order to select and enable the corresponding features. No one should use or reference CONFIG_COMMANDS or CONFIG_BOOTP_MASK any longer.

All of these patches are also available from my repository here:

www.jdl.com/software/u-boot-cfg.git

I'll be around to help fix up any typos and lingering cruft.

Thanks, jdl

PS -- Truth be told, once I started removing #include of the cmd_confdefs.h file, things will potentially break around the CONFIG_BOOTP_* issue until all of these patches are applied. Sorry.

PPS -- Actually, there is _still_ the possibility for a minor breakage around the CONFIG_BOOTP_* issue. It will take some minor work to discover where, though. Specifically, every file that _used_ to #include cmd_confdefs.h automatically defined CONFIG_BOOTP_MASK with default settings. This patch series only defines equivallent CONFIG_BOOTP_ options where a port file explicitly defined its own CONFIG_BOOTP_MASK.

That is, all the board ports that silently had default CONFIG_BOOTP_MASK inheriting the default are _still_ NOT configured properly even after all of these patches. Those boards that DID have a CONFIG_BOOTP_MASK in them will be just fine.

I need to track down which board ports were silently getting the default and make their BOOTP choices explicit now. If you would, give me a day to track those boards down and work up a patchset for them...

Sorry.

README | 28 ++++-- board/MAI/AmigaOneG3SE/cmd_boota.c | 2 +- board/MAI/menu/cmd_menu.c | 2 +- board/Marvell/common/serial.c | 2 +- board/alaska/alaska.c | 2 +- board/altera/dk1c20/dk1c20.c | 4 +- board/amirix/ap1000/serial.c | 2 +- board/at91rm9200dk/at91rm9200dk.c | 6 +- board/atc/atc.c | 2 +- board/atc/ti113x.c | 2 +- board/atmel/atstk1000/eth.c | 2 +- board/bc3450/cmd_bc3450.c | 2 +- board/bf537-stamp/bf537-stamp.c | 4 +- board/bf537-stamp/ether_bf537.c | 2 +- board/bf537-stamp/nand.c | 4 +- board/c2mon/pcmcia.c | 6 +- board/cmc_pu2/cmc_pu2.c | 4 +- board/cogent/serial.c | 2 +- board/cpc45/cpc45.c | 2 +- board/cpc45/pd67290.c | 2 +- board/cpu86/cpu86.c | 2 +- board/cpu87/cpu87.c | 2 +- board/csb637/csb637.c | 4 +- board/dave/PPChameleonEVB/nand.c | 4 +- board/delta/nand.c | 2 +- board/esd/ash405/ash405.c | 2 +- board/esd/cms700/cms700.c | 2 +- board/esd/common/auto_update.c | 16 ++-- board/esd/common/cmd_loadpci.c | 2 +- board/esd/cpci750/serial.c | 2 +- board/esd/hh405/hh405.c | 2 +- board/esd/hub405/hub405.c | 2 +- board/esd/ocrtc/cmd_ocrtc.c | 2 +- board/esd/pci405/cmd_pci405.c | 2 +- board/esd/plu405/plu405.c | 2 +- board/esd/voh405/voh405.c | 2 +- board/esd/wuh405/wuh405.c | 2 +- board/etin/debris/phantom.c | 2 +- board/evb64260/eth.c | 4 +- board/evb64260/serial.c | 2 +- board/evb64260/zuma_pbb.c | 4 +- board/fads/fads.c | 2 +- board/fads/fads.h | 6 +- board/fads/pcmcia.c | 8 +- board/funkwerk/vovpn-gw/m88e6060.c | 2 +- board/funkwerk/vovpn-gw/vovpn-gw.c | 4 +- board/g2000/g2000.c | 4 +- board/gen860t/gen860t.c | 4 +- board/genietv/genietv.c | 2 +- board/gth/pcmcia.c | 6 +- board/hymod/bsp.c | 2 +- board/icu862/pcmcia.c | 6 +- board/ids8247/ids8247.c | 2 +- board/ixdp425/ixdp425.c | 2 +- board/kb9202/kb9202.c | 4 +- board/kup/common/pcmcia.c | 6 +- board/lwmon/lwmon.c | 2 +- board/lwmon/pcmcia.c | 6 +- board/mbx8xx/pcmcia.c | 8 +- board/mcc200/auto_update.c | 2 +- board/mcc200/mcc200.c | 2 +- board/ml2/serial.c | 4 +- board/mp2usb/mp2usb.c | 4 +- board/mpl/common/common_util.c | 6 +- board/mpl/common/common_util.h | 2 +- board/mpl/vcma9/vcma9.c | 2 +- board/mpl/vcma9/vcma9.h | 2 +- board/nc650/nand.c | 4 +- board/netphone/netphone.c | 2 +- board/netstar/nand.c | 2 +- board/netta/netta.c | 4 +- board/netta/pcmcia.c | 6 +- board/netta2/netta2.c | 2 +- board/netvia/netvia.c | 2 +- board/omap2420h4/omap2420h4.c | 4 +- board/pcippc2/pcippc2.c | 2 +- board/pm520/pm520.c | 2 +- board/pm826/pm826.c | 2 +- board/pm828/pm828.c | 2 +- board/pn62/cmd_pn62.c | 2 +- board/prodrive/alpr/nand.c | 2 +- board/prodrive/p3mx/serial.c | 4 +- board/prodrive/pdnb3/nand.c | 2 +- board/prodrive/pdnb3/pdnb3.c | 2 +- board/r360mpi/pcmcia.c | 6 +- board/sacsng/sacsng.c | 2 +- board/sbc2410x/sbc2410x.c | 6 +- board/sc3/sc3nand.c | 2 +- board/siemens/common/fpga.c | 4 +- board/siemens/pcu_e/pcu_e.c | 2 +- board/sixnet/sixnet.c | 6 +- board/ssv/adnpesc1/adnpesc1.c | 2 +- board/ssv/common/cmd_sled.c | 2 +- board/ssv/common/wd_pio.c | 2 +- board/stxxtc/stxxtc.c | 2 +- board/svm_sc8xx/svm_sc8xx.c | 2 +- board/tqm5200/cmd_stk52xx.c | 2 +- board/tqm5200/cmd_tb5200.c | 2 +- board/tqm8272/tqm8272.c | 2 +- board/trab/auto_update.c | 2 +- board/trab/cmd_trab.c | 6 +- board/trab/trab_fkt.c | 12 ++-- board/uc100/pcmcia.c | 6 +- board/w7o/cmd_vpd.c | 4 +- board/xilinx/ml300/serial.c | 2 +- board/zylonite/nand.c | 2 +- common/bedbug.c | 4 +- common/cmd_autoscript.c | 9 +- common/cmd_bdinfo.c | 2 +- common/cmd_bedbug.c | 2 +- common/cmd_bmp.c | 4 +- common/cmd_bootm.c | 22 +++--- common/cmd_cache.c | 2 +- common/cmd_console.c | 2 +- common/cmd_date.c | 2 +- common/cmd_dcr.c | 2 +- common/cmd_diag.c | 2 +- common/cmd_display.c | 2 +- common/cmd_doc.c | 4 +- common/cmd_dtt.c | 4 +- common/cmd_eeprom.c | 8 +- common/cmd_elf.c | 4 +- common/cmd_ext2.c | 6 +- common/cmd_fat.c | 2 +- common/cmd_fdc.c | 17 ++-- common/cmd_fdos.c | 4 +- common/cmd_flash.c | 14 ++-- common/cmd_fpga.c | 6 +- common/cmd_i2c.c | 10 +- common/cmd_ide.c | 4 +- common/cmd_immap.c | 2 +- common/cmd_itest.c | 4 +- common/cmd_jffs2.c | 14 ++-- common/cmd_load.c | 20 ++-- common/cmd_mem.c | 15 +-- common/cmd_mfsl.c | 2 +- common/cmd_mii.c | 2 +- common/cmd_misc.c | 6 +- common/cmd_mmc.c | 2 +- common/cmd_nand.c | 23 ++--- common/cmd_net.c | 22 +++--- common/cmd_nvedit.c | 18 +--- common/cmd_pci.c | 4 +- common/cmd_pcmcia.c | 7 +- common/cmd_portio.c | 2 +- common/cmd_reginfo.c | 6 +- common/cmd_reiser.c | 4 +- common/cmd_scsi.c | 4 +- common/cmd_spi.c | 2 +- common/cmd_universe.c | 4 +- common/cmd_usb.c | 6 +- common/cmd_vfd.c | 2 +- common/cmd_ximg.c | 4 +- common/command.c | 4 +- common/docecc.c | 4 +- common/env_flash.c | 2 +- common/env_nand.c | 2 +- common/exports.c | 4 +- common/hush.c | 2 +- common/kgdb.c | 2 +- common/lcd.c | 4 +- common/main.c | 4 +- common/miiphyutil.c | 4 +- common/usb.c | 4 +- common/usb_storage.c | 2 +- cpu/74xx_7xx/kgdb.S | 2 +- cpu/74xx_7xx/traps.c | 12 ++-- cpu/arm920t/at91rm9200/bcm5221.c | 4 +- cpu/arm920t/at91rm9200/dm9161.c | 4 +- cpu/arm920t/at91rm9200/ether.c | 10 +- cpu/arm920t/at91rm9200/lxt972.c | 4 +- cpu/i386/serial.c | 2 +- cpu/ixp/cpu.c | 2 +- cpu/ixp/npe/npe.c | 2 +- cpu/mcf52x2/fec.c | 14 ++-- cpu/microblaze/cache.c | 2 +- cpu/microblaze/interrupts.c | 4 +- cpu/mips/au1x00_eth.c | 8 +- cpu/mpc5xx/interrupts.c | 4 +- cpu/mpc5xx/traps.c | 16 ++-- cpu/mpc5xxx/cpu_init.c | 2 +- cpu/mpc5xxx/fec.c | 6 +- cpu/mpc5xxx/interrupts.c | 2 +- cpu/mpc5xxx/traps.c | 16 ++-- cpu/mpc8220/cpu_init.c | 2 +- cpu/mpc8220/fec.c | 6 +- cpu/mpc8220/traps.c | 16 ++-- cpu/mpc824x/traps.c | 4 +- cpu/mpc8260/bedbug_603e.c | 2 +- cpu/mpc8260/ether_fcc.c | 6 +- cpu/mpc8260/ether_scc.c | 2 +- cpu/mpc8260/interrupts.c | 4 +- cpu/mpc8260/kgdb.S | 2 +- cpu/mpc8260/traps.c | 16 ++-- cpu/mpc83xx/interrupts.c | 4 +- cpu/mpc83xx/traps.c | 14 ++-- cpu/mpc85xx/ether_fcc.c | 6 +- cpu/mpc85xx/interrupts.c | 4 +- cpu/mpc85xx/traps.c | 14 ++-- cpu/mpc8xx/bedbug_860.c | 2 +- cpu/mpc8xx/fec.c | 18 ++-- cpu/mpc8xx/kgdb.S | 2 +- cpu/mpc8xx/scc.c | 2 +- cpu/mpc8xx/serial.c | 2 +- cpu/mpc8xx/traps.c | 16 ++-- cpu/nios/interrupts.c | 4 +- cpu/nios2/interrupts.c | 4 +- cpu/ppc4xx/4xx_enet.c | 10 +- cpu/ppc4xx/bedbug_405.c | 2 +- cpu/ppc4xx/dcr.S | 2 +- cpu/ppc4xx/interrupts.c | 4 +- cpu/ppc4xx/kgdb.S | 2 +- cpu/ppc4xx/ndfc.c | 2 +- cpu/ppc4xx/serial.c | 2 +- cpu/ppc4xx/traps.c | 14 ++-- cpu/ppc4xx/usbdev.c | 2 +- disk/part.c | 26 +++--- disk/part_amiga.c | 6 +- disk/part_dos.c | 8 +- disk/part_iso.c | 8 +- disk/part_mac.c | 8 +- doc/README.SNTP | 4 +- doc/README.bedbug | 7 -- doc/README.nand | 4 +- drivers/bcm570x.c | 2 +- drivers/cfb_console.c | 8 +- drivers/cs8900.c | 2 +- drivers/dc2114x.c | 2 +- drivers/e1000.c | 2 +- drivers/eepro100.c | 8 +- drivers/inca-ip_sw.c | 2 +- drivers/lan91c96.c | 2 +- drivers/macb.c | 11 +-- drivers/mpc8xx_pcmcia.c | 8 +- drivers/nand/nand.c | 2 +- drivers/nand/nand_base.c | 2 +- drivers/nand/nand_bbt.c | 2 +- drivers/nand/nand_ecc.c | 4 +- drivers/nand/nand_ids.c | 2 +- drivers/nand/nand_util.c | 4 +- drivers/nand_legacy/nand_legacy.c | 4 +- drivers/natsemi.c | 2 +- drivers/netarm_eth.c | 2 +- drivers/ns8382x.c | 2 +- drivers/pcnet.c | 2 +- drivers/plb2800_eth.c | 2 +- drivers/pxa_pcmcia.c | 2 +- drivers/rpx_pcmcia.c | 8 +- drivers/rtl8019.c | 2 +- drivers/rtl8139.c | 2 +- drivers/rtl8169.c | 2 +- drivers/sk98lin/uboot_drv.c | 2 +- drivers/sym53c8xx.c | 4 +- drivers/ti_pci1410a.c | 2 +- drivers/tigon3.c | 2 +- drivers/tqm8xx_pcmcia.c | 6 +- drivers/tsec.c | 7 +- drivers/tsi108_eth.c | 2 +- drivers/tsi108_i2c.c | 4 +- fs/cramfs/cramfs.c | 2 +- fs/cramfs/uncompress.c | 2 +- fs/ext2/dev.c | 2 +- fs/ext2/ext2fs.c | 2 +- fs/fat/fat.c | 16 ++-- fs/fat/file.c | 4 +- fs/fdos/dev.c | 2 +- fs/fdos/fat.c | 2 +- fs/fdos/fdos.c | 2 +- fs/fdos/fs.c | 2 +- fs/fdos/subdir.c | 2 +- fs/fdos/vfat.c | 2 +- fs/jffs2/compr_lzari.c | 4 +- fs/jffs2/compr_lzo.c | 4 +- fs/jffs2/compr_rtime.c | 2 +- fs/jffs2/compr_rubin.c | 2 +- fs/jffs2/compr_zlib.c | 2 +- fs/jffs2/jffs2_1pass.c | 20 ++-- fs/jffs2/jffs2_nand_1pass.c | 2 +- fs/jffs2/mini_inflate.c | 2 +- fs/reiserfs/dev.c | 2 +- fs/reiserfs/mode_string.c | 2 +- fs/reiserfs/reiserfs.c | 2 +- include/_exports.h | 2 +- include/cmd_confdefs.h | 163 ------------------------------------ include/config_bootp.h | 41 --------- include/configs/AMX860.h | 11 ++- include/configs/AmigaOneG3SE.h | 13 ++- include/configs/B2.h | 9 ++- include/configs/BAB7xx.h | 11 ++- include/configs/CCM.h | 9 ++- include/configs/CMS700.h | 15 +++- include/configs/CPC45.h | 10 ++- include/configs/CPCI405.h | 15 +++- include/configs/CPCI4052.h | 15 +++- include/configs/CPCI405AB.h | 15 +++- include/configs/CPCI405DT.h | 15 +++- include/configs/CPCI750.h | 10 ++- include/configs/CPU86.h | 13 ++- include/configs/CPU87.h | 13 ++- include/configs/CRAYL1.h | 20 ++-- include/configs/CU824.h | 10 ++- include/configs/DB64360.h | 12 ++- include/configs/DB64460.h | 12 ++- include/configs/ELPPC.h | 10 ++- include/configs/ELPT860.h | 10 ++- include/configs/ESTEEM192E.h | 10 ++- include/configs/ETX094.h | 10 ++- include/configs/EVB64260.h | 10 ++- include/configs/FADS823.h | 21 +++++- include/configs/FLAGADM.h | 10 ++- include/configs/FPS850L.h | 20 ++++- include/configs/FPS860L.h | 19 ++++- include/configs/GEN860T.h | 9 ++- include/configs/HMI10.h | 10 ++- include/configs/IAD210.h | 10 ++- include/configs/ICU862.h | 10 ++- include/configs/IDS8247.h | 13 ++- include/configs/IP860.h | 8 ++- include/configs/IPHASE4539.h | 12 ++- include/configs/ISPAN.h | 3 +- include/configs/IVML24.h | 10 ++- include/configs/IVMS8.h | 10 ++- include/configs/KUP4K.h | 10 ++- include/configs/KUP4X.h | 10 ++- include/configs/LANTEC.h | 9 ++- include/configs/MHPC.h | 10 ++- include/configs/MPC8260ADS.h | 3 +- include/configs/MPC8266ADS.h | 17 ++-- include/configs/MVBLUE.h | 20 ++++- include/configs/MVS1.h | 10 ++- include/configs/NC650.h | 10 ++- include/configs/NETPHONE.h | 10 ++- include/configs/NETTA.h | 11 ++- include/configs/NETTA2.h | 11 ++- include/configs/NETVIA.h | 11 ++- include/configs/NSCU.h | 10 ++- include/configs/NX823.h | 10 ++- include/configs/P3G4.h | 11 ++- include/configs/PCIPPC2.h | 10 ++- include/configs/PCIPPC6.h | 10 ++- include/configs/PM826.h | 12 ++- include/configs/PM828.h | 12 ++- include/configs/QS823.h | 10 ++- include/configs/QS850.h | 9 ++- include/configs/QS860T.h | 10 ++- include/configs/R360MPI.h | 9 ++- include/configs/RBC823.h | 10 ++- include/configs/RPXClassic.h | 10 ++- include/configs/RPXlite.h | 10 ++- include/configs/RPXlite_DW.h | 10 ++- include/configs/RPXsuper.h | 3 +- include/configs/RRvision.h | 10 ++- include/configs/Rattler.h | 4 +- include/configs/SCM.h | 12 ++- include/configs/SM850.h | 10 ++- include/configs/SMN42.h | 10 ++- include/configs/SPD823TS.h | 10 ++- include/configs/TOP860.h | 9 +- include/configs/TQM823L.h | 10 ++- include/configs/TQM823M.h | 10 ++- include/configs/TQM8260.h | 13 ++- include/configs/TQM8272.h | 12 ++- include/configs/TQM850L.h | 10 ++- include/configs/TQM850M.h | 10 ++- include/configs/TQM855L.h | 10 ++- include/configs/TQM855M.h | 10 ++- include/configs/TQM860L.h | 10 ++- include/configs/TQM860M.h | 10 ++- include/configs/TQM862L.h | 10 ++- include/configs/TQM862M.h | 10 ++- include/configs/TQM866M.h | 10 ++- include/configs/TQM885D.h | 10 ++- include/configs/VOM405.h | 14 ++- include/configs/VoVPN-GW.h | 3 +- include/configs/ZPC1900.h | 4 +- include/configs/ZUMA.h | 10 ++- include/configs/armadillo.h | 9 ++- include/configs/assabet.h | 9 ++- include/configs/atc.h | 14 ++- include/configs/atstk1002.h | 8 ++- include/configs/barco.h | 16 ++-- include/configs/c2mon.h | 10 ++- include/configs/cogent_mpc8260.h | 3 +- include/configs/csb272.h | 12 ++- include/configs/csb472.h | 13 ++- include/configs/ep7312.h | 9 ++- include/configs/ep8248.h | 4 +- include/configs/ep8260.h | 3 +- include/configs/ep82xxm.h | 4 +- include/configs/evb4510.h | 9 ++- include/configs/gcplus.h | 9 ++- include/configs/gw8260.h | 18 ++-- include/configs/hermes.h | 9 ++- include/configs/hymod.h | 3 +- include/configs/impa7.h | 9 ++- include/configs/integratorap.h | 1 - include/configs/integratorcp.h | 2 - include/configs/kvme080.h | 10 ++- include/configs/lpc2292sodimm.h | 9 ++- include/configs/lwmon.h | 9 ++- include/configs/modnet50.h | 9 ++- include/configs/mpc7448hpc2.h | 10 ++- include/configs/netstar.h | 9 ++- include/configs/omap1510inn.h | 9 ++- include/configs/omap1610h2.h | 9 ++- include/configs/omap1610inn.h | 9 ++- include/configs/omap2420h4.h | 9 ++- include/configs/omap5912osk.h | 9 ++- include/configs/omap730p2.h | 9 ++- include/configs/p3mx.h | 11 ++- include/configs/pcu_e.h | 10 ++- include/configs/ppmc8260.h | 19 +++-- include/configs/quantum.h | 10 ++- include/configs/rmu.h | 10 ++- include/configs/rsdproto.h | 3 +- include/configs/sacsng.h | 23 +++--- include/configs/sbc405.h | 10 ++- include/configs/sbc8240.h | 10 ++- include/configs/sbc8260.h | 23 +++--- include/configs/sc3.h | 3 +- include/configs/stxxtc.h | 11 ++- include/configs/svm_sc8xx.h | 9 ++- include/configs/uc100.h | 10 ++- include/configs/v37.h | 10 ++- include/configs/versatile.h | 9 ++- include/configs/virtlab2.h | 10 ++- include/configs/voiceblue.h | 10 ++- include/exports.h | 2 +- include/lcd.h | 4 +- include/mk48t59.h | 2 +- include/net.h | 8 +- include/pcmcia.h | 6 +- lib_arm/board.c | 8 +- lib_avr32/board.c | 2 +- lib_blackfin/board.c | 6 +- lib_generic/crc32.c | 4 +- lib_i386/board.c | 17 ++-- lib_m68k/board.c | 20 ++-- lib_microblaze/board.c | 8 +- lib_mips/board.c | 4 +- lib_ppc/board.c | 34 ++++---- lib_ppc/kgdb.c | 2 +- net/bootp.c | 76 ++++++++-------- net/bootp.h | 2 +- net/eth.c | 8 +- net/net.c | 62 +++++++------- net/nfs.c | 6 +- net/rarp.c | 4 +- net/sntp.c | 8 +- net/tftp.c | 2 +- rtc/bf5xx_rtc.c | 2 +- rtc/date.c | 2 +- rtc/ds12887.c | 4 +- rtc/ds1302.c | 2 +- rtc/ds1306.c | 2 +- rtc/ds1307.c | 2 +- rtc/ds1337.c | 2 +- rtc/ds1374.c | 2 +- rtc/ds1556.c | 2 +- rtc/ds164x.c | 2 +- rtc/ds174x.c | 2 +- rtc/ds3231.c | 4 +- rtc/m41t11.c | 2 +- rtc/m48t35ax.c | 2 +- rtc/max6900.c | 2 +- rtc/mc146818.c | 2 +- rtc/mk48t59.c | 4 +- rtc/mpc5xxx.c | 2 +- rtc/mpc8xx.c | 2 +- rtc/pcf8563.c | 2 +- rtc/rs5c372.c | 4 +- rtc/s3c24x0_rtc.c | 2 +- tools/updater/cmd_flash.c | 2 +- 473 files changed, 2002 insertions(+), 1326 deletions(-)