]> git.karo-electronics.de Git - karo-tx-uboot.git/commitdiff
Merge with git://www.denx.de/git/u-boot.git
authorMarkus Klotzbuecher <mk@denx.de>
Tue, 7 Aug 2007 20:30:29 +0000 (22:30 +0200)
committerMarkus Klotzbuecher <mk@pollux.denx.de>
Tue, 7 Aug 2007 20:30:29 +0000 (22:30 +0200)
1  2 
Makefile
README
board/trab/auto_update.c
drivers/Makefile
include/configs/IceCube.h
include/configs/MPC8641HPCN.h
include/configs/TQM5200.h
include/configs/delta.h
include/configs/mp2usb.h
include/configs/trab.h
include/configs/yosemite.h

diff --combined Makefile
index cf4ce6efff75cff939cce08a829d8447599fbadf,cf3fbcbf20b69c93218a282695a51b720559e183..99bb03b6dbe1284ea7a4773a47f871108ea741e1
+++ b/Makefile
@@@ -122,7 -122,7 +122,7 @@@ ifeq ($(HOSTARCH),$(ARCH)
  CROSS_COMPILE =
  else
  ifeq ($(ARCH),ppc)
 -CROSS_COMPILE = powerpc-linux-
 +CROSS_COMPILE = ppc_8xx-
  endif
  ifeq ($(ARCH),arm)
  CROSS_COMPILE = arm-linux-
@@@ -173,9 -173,6 +173,6 @@@ endi
  ifeq ($(CPU),mpc85xx)
  OBJS += cpu/$(CPU)/resetvec.o
  endif
- ifeq ($(CPU),mpc86xx)
- OBJS += cpu/$(CPU)/resetvec.o
- endif
  ifeq ($(CPU),bf533)
  OBJS += cpu/$(CPU)/start1.o   cpu/$(CPU)/interrupt.o  cpu/$(CPU)/cache.o
  OBJS += cpu/$(CPU)/flush.o    cpu/$(CPU)/init_sdram.o
@@@ -208,6 -205,7 +205,7 @@@ LIBS += disk/libdisk.
  LIBS += rtc/librtc.a
  LIBS += dtt/libdtt.a
  LIBS += drivers/libdrivers.a
+ LIBS += drivers/bios_emulator/libatibiosemu.a
  LIBS += drivers/nand/libnand.a
  LIBS += drivers/nand_legacy/libnand_legacy.a
  ifeq ($(CPU),mpc83xx)
@@@ -217,6 -215,8 +215,8 @@@ LIBS += drivers/sk98lin/libsk98lin.
  LIBS += post/libpost.a post/drivers/libpostdrivers.a
  LIBS += $(shell if [ -d post/lib_$(ARCH) ]; then echo \
        "post/lib_$(ARCH)/libpost$(ARCH).a"; fi)
+ LIBS += $(shell if [ -d post/lib_$(ARCH)/fpu ]; then echo \
+       "post/lib_$(ARCH)/fpu/libpost$(ARCH)fpu.a"; fi)
  LIBS += $(shell if [ -d post/cpu/$(CPU) ]; then echo \
        "post/cpu/$(CPU)/libpost$(CPU).a"; fi)
  LIBS += $(shell if [ -d post/board/$(BOARDDIR) ]; then echo \
@@@ -248,7 -248,7 +248,7 @@@ __LIBS := $(subst $(obj),,$(LIBS)
  #########################################################################
  #########################################################################
  
- ALL = $(obj)u-boot.srec $(obj)u-boot.bin $(obj)System.map $(U_BOOT_NAND)
+ ALL += $(obj)u-boot.srec $(obj)u-boot.bin $(obj)System.map $(U_BOOT_NAND)
  
  all:          $(ALL)
  
@@@ -268,6 -268,9 +268,9 @@@ $(obj)u-boot.img:  $(obj)u-boot.bi
                        sed -e 's/"[     ]*$$/ for $(BOARD) board"/') \
                -d $< $@
  
+ $(obj)u-boot.sha1:    $(obj)u-boot.bin
+               $(obj)tools/ubsha1 $(obj)u-boot.bin
  $(obj)u-boot.dis:     $(obj)u-boot
                $(OBJDUMP) -d $< > $@
  
@@@ -427,7 -430,7 +430,7 @@@ jupiter_config:         unconfi
        @$(MKCONFIG) jupiter ppc mpc5xxx jupiter
  
  v38b_config: unconfig
-       @./mkconfig -a v38b ppc mpc5xxx v38b
+       @$(MKCONFIG) -a v38b ppc mpc5xxx v38b
  
  inka4x0_config:       unconfig
        @$(MKCONFIG) inka4x0 ppc mpc5xxx inka4x0
@@@ -530,6 -533,9 +533,9 @@@ PM520_ROMBOOT_DDR_config:  unconfi
  smmaco4_config: unconfig
        @$(MKCONFIG) -a smmaco4 ppc mpc5xxx tqm5200
  
+ cm5200_config:        unconfig
+       @./mkconfig -a cm5200 ppc mpc5xxx cm5200
  spieval_config:       unconfig
        @$(MKCONFIG) -a spieval ppc mpc5xxx tqm5200
  
@@@ -631,6 -637,13 +637,13 @@@ motionpro_config:         unconfi
        @$(MKCONFIG) motionpro ppc mpc5xxx motionpro
  
  
+ #########################################################################
+ ## MPC512x Systems
+ #########################################################################
+ ads5121_config: unconfig
+       @$(MKCONFIG) ads5121 ppc mpc512x ads5121
  #########################################################################
  ## MPC8xx Systems
  #########################################################################
@@@ -644,9 -657,6 +657,9 @@@ AdderII_config  
        @echo "#define CONFIG_MPC852T" > $(obj)include/config.h)
        @$(MKCONFIG) -a Adder ppc mpc8xx adder
  
 +AdderUSB_config:      unconfig
 +      @./mkconfig -a AdderUSB ppc mpc8xx adder
 +
  ADS860_config     \
  FADS823_config    \
  FADS850SAR_config \
@@@ -1020,11 -1030,19 +1033,19 @@@ xtract_4xx = $(subst _25,,$(subst _33,,
  acadia_config:        unconfig
        @$(MKCONFIG) $(@:_config=) ppc ppc4xx acadia amcc
  
+ acadia_nand_config:   unconfig
+       @mkdir -p $(obj)include $(obj)board/amcc/acadia
+       @mkdir -p $(obj)nand_spl/board/amcc/acadia
+       @echo "#define CONFIG_NAND_U_BOOT" > $(obj)include/config.h
+       @$(MKCONFIG) -n $@ -a acadia ppc ppc4xx acadia amcc
+       @echo "TEXT_BASE = 0x01000000" > $(obj)board/amcc/acadia/config.tmp
+       @echo "CONFIG_NAND_U_BOOT = y" >> $(obj)include/config.mk
  ADCIOP_config:        unconfig
        @$(MKCONFIG) $(@:_config=) ppc ppc4xx adciop esd
  
  alpr_config:  unconfig
-       @./mkconfig $(@:_config=) ppc ppc4xx alpr prodrive
+       @$(MKCONFIG) $(@:_config=) ppc ppc4xx alpr prodrive
  
  AP1000_config:unconfig
        @$(MKCONFIG) $(@:_config=) ppc ppc4xx ap1000 amirix
@@@ -1042,9 -1060,8 +1063,8 @@@ bamboo_config:  unconfi
        @$(MKCONFIG) $(@:_config=) ppc ppc4xx bamboo amcc
  
  bamboo_nand_config:   unconfig
-       @mkdir -p $(obj)include
-       @mkdir -p $(obj)nand_spl
-       @mkdir -p $(obj)board/amcc/bamboo
+       @mkdir -p $(obj)include $(obj)board/amcc/bamboo
+       @mkdir -p $(obj)nand_spl/board/amcc/bamboo
        @echo "#define CONFIG_NAND_U_BOOT" > $(obj)include/config.h
        @$(MKCONFIG) -n $@ -a bamboo ppc ppc4xx bamboo amcc
        @echo "TEXT_BASE = 0x01000000" > $(obj)board/amcc/bamboo/config.tmp
@@@ -1136,6 -1153,9 +1156,9 @@@ katmai_config:  unconfi
  luan_config:  unconfig
        @$(MKCONFIG) $(@:_config=) ppc ppc4xx luan amcc
  
+ lwmon5_config:        unconfig
+       @$(MKCONFIG) $(@:_config=) ppc ppc4xx lwmon5
  METROBOX_config: unconfig
        @$(MKCONFIG) $(@:_config=) ppc ppc4xx metrobox sandburst
  
@@@ -1222,9 -1242,8 +1245,8 @@@ rainier_config: unconfi
  
  sequoia_nand_config \
  rainier_nand_config: unconfig
-       @mkdir -p $(obj)include
-       @mkdir -p $(obj)nand_spl
-       @mkdir -p $(obj)board/amcc/sequoia
+       @mkdir -p $(obj)include $(obj)board/amcc/sequoia
+       @mkdir -p $(obj)nand_spl/board/amcc/sequoia
        @echo "#define CONFIG_NAND_U_BOOT" > $(obj)include/config.h
        @echo "#define CONFIG_$$(echo $(subst ,,$(@:_config=)) | \
                tr '[:lower:]' '[:upper:]')" >> $(obj)include/config.h
        @echo "CONFIG_NAND_U_BOOT = y" >> $(obj)include/config.mk
  
  sc3_config:unconfig
-       @./mkconfig $(@:_config=) ppc ppc4xx sc3
+       @$(MKCONFIG) $(@:_config=) ppc ppc4xx sc3
  
  taishan_config:       unconfig
        @$(MKCONFIG) $(@:_config=) ppc ppc4xx taishan amcc
@@@ -1399,7 -1418,7 +1421,7 @@@ ep8260_config:  unconfi
        @$(MKCONFIG) $(@:_config=) ppc mpc8260 ep8260
  
  ep82xxm_config:       unconfig
-       @./mkconfig $(@:_config=) ppc mpc8260 ep82xxm
+       @$(MKCONFIG) $(@:_config=) ppc mpc8260 ep82xxm
  
  gw8260_config:        unconfig
        @$(MKCONFIG) $(@:_config=) ppc mpc8260 gw8260
@@@ -1640,14 -1659,15 +1662,15 @@@ r5200_config :               unconfi
  
  MPC8313ERDB_33_config \
  MPC8313ERDB_66_config: unconfig
-       @echo "" >include/config.h ; \
+       @mkdir -p $(obj)include
+       @echo "" >$(obj)include/config.h ; \
        if [ "$(findstring _33_,$@)" ] ; then \
-               echo -n "...33M ..." ; \
-               echo "#define CFG_33MHZ" >>include/config.h ; \
+               echo "...33M ..." ; \
+               echo "#define CFG_33MHZ" >>$(obj)include/config.h ; \
        fi ; \
        if [ "$(findstring _66_,$@)" ] ; then \
-               echo -n "...66M..." ; \
-               echo "#define CFG_66MHZ" >>include/config.h ; \
+               echo "...66M..." ; \
+               echo "#define CFG_66MHZ" >>$(obj)include/config.h ; \
        fi ;
        @$(MKCONFIG) -a MPC8313ERDB ppc mpc83xx mpc8313erdb
  
@@@ -1655,23 -1675,24 +1678,24 @@@ MPC832XEMDS_config 
  MPC832XEMDS_HOST_33_config \
  MPC832XEMDS_HOST_66_config \
  MPC832XEMDS_SLAVE_config:     unconfig
-       @echo "" >include/config.h ; \
+       @mkdir -p $(obj)include
+       @echo "" >$(obj)include/config.h ; \
        if [ "$(findstring _HOST_,$@)" ] ; then \
-               echo -n "... PCI HOST " ; \
-               echo "#define CONFIG_PCI" >>include/config.h ; \
+               echo "... PCI HOST " ; \
+               echo "#define CONFIG_PCI" >>$(obj)include/config.h ; \
        fi ; \
        if [ "$(findstring _SLAVE_,$@)" ] ; then \
                echo "...PCI SLAVE 66M"  ; \
-               echo "#define CONFIG_PCI" >>include/config.h ; \
-               echo "#define CONFIG_PCISLAVE" >>include/config.h ; \
+               echo "#define CONFIG_PCI" >>$(obj)include/config.h ; \
+               echo "#define CONFIG_PCISLAVE" >>$(obj)include/config.h ; \
        fi ; \
        if [ "$(findstring _33_,$@)" ] ; then \
-               echo -n "...33M ..." ; \
-               echo "#define PCI_33M" >>include/config.h ; \
+               echo "...33M ..." ; \
+               echo "#define PCI_33M" >>$(obj)include/config.h ; \
        fi ; \
        if [ "$(findstring _66_,$@)" ] ; then \
-               echo -n "...66M..." ; \
-               echo "#define PCI_66M" >>include/config.h ; \
+               echo "...66M..." ; \
+               echo "#define PCI_66M" >>$(obj)include/config.h ; \
        fi ;
        @$(MKCONFIG) -a MPC832XEMDS ppc mpc83xx mpc832xemds
  
@@@ -1696,23 -1717,24 +1720,24 @@@ MPC8360EMDS_config 
  MPC8360EMDS_HOST_33_config \
  MPC8360EMDS_HOST_66_config \
  MPC8360EMDS_SLAVE_config:     unconfig
-       @echo "" >include/config.h ; \
+       @mkdir -p $(obj)include
+       @echo "" >$(obj)include/config.h ; \
        if [ "$(findstring _HOST_,$@)" ] ; then \
-               echo -n "... PCI HOST " ; \
-               echo "#define CONFIG_PCI" >>include/config.h ; \
+               echo "... PCI HOST " ; \
+               echo "#define CONFIG_PCI" >>$(obj)include/config.h ; \
        fi ; \
        if [ "$(findstring _SLAVE_,$@)" ] ; then \
                echo "...PCI SLAVE 66M"  ; \
-               echo "#define CONFIG_PCI" >>include/config.h ; \
-               echo "#define CONFIG_PCISLAVE" >>include/config.h ; \
+               echo "#define CONFIG_PCI" >>$(obj)include/config.h ; \
+               echo "#define CONFIG_PCISLAVE" >>$(obj)include/config.h ; \
        fi ; \
        if [ "$(findstring _33_,$@)" ] ; then \
-               echo -n "...33M ..." ; \
-               echo "#define PCI_33M" >>include/config.h ; \
+               echo "...33M ..." ; \
+               echo "#define PCI_33M" >>$(obj)include/config.h ; \
        fi ; \
        if [ "$(findstring _66_,$@)" ] ; then \
-               echo -n "...66M..." ; \
-               echo "#define PCI_66M" >>include/config.h ; \
+               echo "...66M..." ; \
+               echo "#define PCI_66M" >>$(obj)include/config.h ; \
        fi ;
        @$(MKCONFIG) -a MPC8360EMDS ppc mpc83xx mpc8360emds
  
@@@ -1738,10 -1760,10 +1763,10 @@@ MPC8540EVAL_66_slave_config:      uncon
        @mkdir -p $(obj)include
        @echo "" >$(obj)include/config.h ; \
        if [ "$(findstring _33_,$@)" ] ; then \
-               echo -n "... 33 MHz PCI" ; \
+               echo "... 33 MHz PCI" ; \
        else \
                echo "#define CONFIG_SYSCLK_66M" >>$(obj)include/config.h ; \
-               echo -n "... 66 MHz PCI" ; \
+               echo "... 66 MHz PCI" ; \
        fi ; \
        if [ "$(findstring _slave_,$@)" ] ; then \
                echo "#define CONFIG_PCI_SLAVE" >>$(obj)include/config.h ; \
@@@ -1835,7 -1857,7 +1860,7 @@@ TQM8560_config:         unconfi
  #########################################################################
  
  MPC8641HPCN_config:    unconfig
-       @./mkconfig $(@:_config=) ppc mpc86xx mpc8641hpcn
+       @$(MKCONFIG) $(@:_config=) ppc mpc86xx mpc8641hpcn
  
  
  #########################################################################
@@@ -2002,13 -2024,13 +2027,13 @@@ omap1610h2_cs3boot_config 
  omap1610h2_cs_autoboot_config:        unconfig
        @mkdir -p $(obj)include
        @if [ "$(findstring _cs0boot_, $@)" ] ; then \
-               echo "#define CONFIG_CS0_BOOT" >> .$(obj)/include/config.h ; \
+               echo "#define CONFIG_CS0_BOOT" >> .$(obj)include/config.h ; \
                echo "... configured for CS0 boot"; \
        elif [ "$(findstring _cs_autoboot_, $@)" ] ; then \
-               echo "#define CONFIG_CS_AUTOBOOT" >> $(obj)./include/config.h ; \
+               echo "#define CONFIG_CS_AUTOBOOT" >> $(obj)include/config.h ; \
                echo "... configured for CS_AUTO boot"; \
        else \
-               echo "#define CONFIG_CS3_BOOT" >> $(obj)./include/config.h ; \
+               echo "#define CONFIG_CS3_BOOT" >> $(obj)include/config.h ; \
                echo "... configured for CS3 boot"; \
        fi;
        @$(MKCONFIG) -a $(call xtract_omap1610xxx,$@) arm arm926ejs omap1610inn NULL omap
@@@ -2133,7 -2155,10 +2158,10 @@@ evb4510_config :      unconfi
        @$(MKCONFIG) $(@:_config=) arm arm720t evb4510
  
  lpc2292sodimm_config: unconfig
-       @$(MKCONFIG) $(@:_config=) arm arm720t lpc2292sodimm
+       @$(MKCONFIG) $(@:_config=) arm arm720t lpc2292sodimm NULL lpc2292
+ SMN42_config  :       unconfig
+       @$(MKCONFIG) $(@:_config=) arm arm720t SMN42 siemens lpc2292
  
  #########################################################################
  ## XScale Systems
@@@ -2174,11 -2199,12 +2202,12 @@@ logodl_config        :       unconfi
  
  pdnb3_config \
  scpu_config:    unconfig
+       @mkdir -p $(obj)include
        @if [ "$(findstring scpu_,$@)" ] ; then \
-               echo "#define CONFIG_SCPU"      >>include/config.h ; \
+               echo "#define CONFIG_SCPU"      >>$(obj)include/config.h ; \
                echo "... on SCPU board variant" ; \
        else \
-               >include/config.h ; \
+               >$(obj)include/config.h ; \
        fi
        @$(MKCONFIG) -a pdnb3 arm ixp pdnb3 prodrive
  
@@@ -2400,14 -2426,16 +2429,16 @@@ suzaku_config:       unconfi
        @$(MKCONFIG) -a $(@:_config=) microblaze microblaze suzaku AtmarkTechno
  
  ml401_config: unconfig
-       @ >include/config.h
-       @echo "#define CONFIG_ML401 1" >> include/config.h
-       @./mkconfig -a $(@:_config=) microblaze microblaze ml401 xilinx
+       @mkdir -p $(obj)include
+       @ >$(obj)include/config.h
+       @echo "#define CONFIG_ML401 1" >> $(obj)include/config.h
+       @$(MKCONFIG) -a $(@:_config=) microblaze microblaze ml401 xilinx
  
  xupv2p_config:        unconfig
-       @ >include/config.h
-       @echo "#define CONFIG_XUPV2P 1" >> include/config.h
-       @./mkconfig -a $(@:_config=) microblaze microblaze xupv2p xilinx
+       @mkdir -p $(obj)include
+       @ >$(obj)include/config.h
+       @echo "#define CONFIG_XUPV2P 1" >> $(obj)include/config.h
+       @$(MKCONFIG) -a $(@:_config=) microblaze microblaze xupv2p xilinx
  
  #########################################################################
  ## Blackfin
@@@ -2432,7 -2460,7 +2463,7 @@@ bf561-ezkit_config:     unconfi
  #########################################################################
  
  atstk1002_config      :       unconfig
-       @./mkconfig $(@:_config=) avr32 at32ap atstk1000 atmel at32ap7000
+       @$(MKCONFIG) $(@:_config=) avr32 at32ap atstk1000 atmel at32ap7000
  
  #########################################################################
  #########################################################################
@@@ -2449,7 -2477,7 +2480,7 @@@ clean
              $(obj)examples/smc91111_eeprom $(obj)examples/interrupt \
              $(obj)examples/test_burst
        rm -f $(obj)tools/img2srec $(obj)tools/mkimage $(obj)tools/envcrc \
-               $(obj)tools/gen_eth_addr
+               $(obj)tools/gen_eth_addr $(obj)tools/ubsha1
        rm -f $(obj)tools/mpc86x_clk $(obj)tools/ncb
        rm -f $(obj)tools/easylogo/easylogo $(obj)tools/bmp_logo
        rm -f $(obj)tools/gdb/astest $(obj)tools/gdb/gdbcont $(obj)tools/gdb/gdbsend
@@@ -2472,7 -2500,7 +2503,7 @@@ clobber:        clea
        rm -f $(OBJS) $(obj)*.bak $(obj)ctags $(obj)etags $(obj)TAGS $(obj)include/version_autogenerated.h
        rm -fr $(obj)*.*~
        rm -f $(obj)u-boot $(obj)u-boot.map $(obj)u-boot.hex $(ALL)
-       rm -f $(obj)tools/crc32.c $(obj)tools/environment.c $(obj)tools/env/crc32.c
+       rm -f $(obj)tools/crc32.c $(obj)tools/environment.c $(obj)tools/env/crc32.c $(obj)tools/sha1.c
        rm -f $(obj)tools/inca-swap-bytes $(obj)cpu/mpc824x/bedbug_603e.c
        rm -f $(obj)include/asm/proc $(obj)include/asm/arch $(obj)include/asm
        [ ! -d $(OBJTREE)/nand_spl ] || find $(obj)nand_spl -lname "*" -print | xargs rm -f
diff --combined README
index 294f0c1dce0c1ebe70b32ec10ff9255c48257c8c,852ad72acdc09c80c45f3debf49b7908aed7bd35..0df024fb7cf0f9dd22b33a852ba1865ba8a07142
--- 1/README
--- 2/README
+++ b/README
@@@ -249,7 -249,6 +249,7 @@@ The following options need to be config
                CONFIG_SA1110
                CONFIG_ARM7
                CONFIG_PXA250
 +              CONFIG_PXA27X
                CONFIG_CPU_MONAHANS
  
                MicroBlaze based CPUs:
                        CFG_CONSOLE_BLINK_COUNT blink interval (cf. i8042.c)
                        CONFIG_CONSOLE_TIME     display time/date info in
                                                upper right corner
-                                               (requires CFG_CMD_DATE)
+                                               (requires CONFIG_CMD_DATE)
                        CONFIG_VIDEO_LOGO       display Linux logo in
                                                upper left corner
                        CONFIG_VIDEO_BMP_LOGO   use bmp_logo.h instead of
                time on others. This setting #define's the initial
                value of the "loads_echo" environment variable.
  
- - Kgdb Serial Baudrate: (if CFG_CMD_KGDB is defined)
+ - Kgdb Serial Baudrate: (if CONFIG_CMD_KGDB is defined)
                CONFIG_KGDB_BAUDRATE
                Select one of the baudrates listed in
                CFG_BAUDRATE_TABLE, see below.
  
  - Monitor Functions:
-               CONFIG_COMMANDS
-               Most monitor functions can be selected (or
-               de-selected) by adjusting the definition of
-               CONFIG_COMMANDS; to select individual functions,
-               #define CONFIG_COMMANDS by "OR"ing any of the
-               following values:
-               #define enables commands:
-               -------------------------
-               CFG_CMD_ASKENV  * ask for env variable
-               CFG_CMD_AUTOSCRIPT Autoscript Support
-               CFG_CMD_BDI       bdinfo
-               CFG_CMD_BEDBUG  * Include BedBug Debugger
-               CFG_CMD_BMP     * BMP support
-               CFG_CMD_BSP     * Board specific commands
-               CFG_CMD_BOOTD     bootd
-               CFG_CMD_CACHE   * icache, dcache
-               CFG_CMD_CONSOLE   coninfo
-               CFG_CMD_DATE    * support for RTC, date/time...
-               CFG_CMD_DHCP    * DHCP support
-               CFG_CMD_DIAG    * Diagnostics
-               CFG_CMD_DOC     * Disk-On-Chip Support
-               CFG_CMD_DTT     * Digital Therm and Thermostat
-               CFG_CMD_ECHO      echo arguments
-               CFG_CMD_EEPROM  * EEPROM read/write support
-               CFG_CMD_ELF     * bootelf, bootvx
-               CFG_CMD_ENV       saveenv
-               CFG_CMD_FDC     * Floppy Disk Support
-               CFG_CMD_FAT     * FAT partition support
-               CFG_CMD_FDOS    * Dos diskette Support
-               CFG_CMD_FLASH     flinfo, erase, protect
-               CFG_CMD_FPGA      FPGA device initialization support
-               CFG_CMD_HWFLOW  * RTS/CTS hw flow control
-               CFG_CMD_I2C     * I2C serial bus support
-               CFG_CMD_IDE     * IDE harddisk support
-               CFG_CMD_IMI       iminfo
-               CFG_CMD_IMLS      List all found images
-               CFG_CMD_IMMAP   * IMMR dump support
-               CFG_CMD_IRQ     * irqinfo
-               CFG_CMD_ITEST     Integer/string test of 2 values
-               CFG_CMD_JFFS2   * JFFS2 Support
-               CFG_CMD_KGDB    * kgdb
-               CFG_CMD_LOADB     loadb
-               CFG_CMD_LOADS     loads
-               CFG_CMD_MEMORY    md, mm, nm, mw, cp, cmp, crc, base,
-                                 loop, loopw, mtest
-               CFG_CMD_MISC      Misc functions like sleep etc
-               CFG_CMD_MMC     * MMC memory mapped support
-               CFG_CMD_MII     * MII utility commands
-               CFG_CMD_NAND    * NAND support
-               CFG_CMD_NET       bootp, tftpboot, rarpboot
-               CFG_CMD_PCI     * pciinfo
-               CFG_CMD_PCMCIA  * PCMCIA support
-               CFG_CMD_PING    * send ICMP ECHO_REQUEST to network host
-               CFG_CMD_PORTIO  * Port I/O
-               CFG_CMD_REGINFO * Register dump
-               CFG_CMD_RUN       run command in env variable
-               CFG_CMD_SAVES   * save S record dump
-               CFG_CMD_SCSI    * SCSI Support
-               CFG_CMD_SDRAM   * print SDRAM configuration information
-                                 (requires CFG_CMD_I2C)
-               CFG_CMD_SETGETDCR Support for DCR Register access (4xx only)
-               CFG_CMD_SPI     * SPI serial bus support
-               CFG_CMD_USB     * USB support
-               CFG_CMD_VFD     * VFD support (TRAB)
-               CFG_CMD_BSP     * Board SPecific functions
-               CFG_CMD_CDP     * Cisco Discover Protocol support
-               CFG_CMD_FSL     * Microblaze FSL support
-               -----------------------------------------------
-               CFG_CMD_ALL     all
-               CONFIG_CMD_DFL  Default configuration; at the moment
-                               this is includes all commands, except
-                               the ones marked with "*" in the list
-                               above.
-               If you don't define CONFIG_COMMANDS it defaults to
-               CONFIG_CMD_DFL in include/cmd_confdefs.h. A board can
-               override the default settings in the respective
-               include file.
+               Monitor commands can be included or excluded
+               from the build by using the #include files
+               "config_cmd_all.h" and #undef'ing unwanted
+               commands, or using "config_cmd_default.h"
+               and augmenting with additional #define's
+               for wanted commands.
+               The default command configuration includes all commands
+               except those marked below with a "*".
+               CONFIG_CMD_ASKENV       * ask for env variable
+               CONFIG_CMD_AUTOSCRIPT     Autoscript Support
+               CONFIG_CMD_BDI            bdinfo
+               CONFIG_CMD_BEDBUG       * Include BedBug Debugger
+               CONFIG_CMD_BMP          * BMP support
+               CONFIG_CMD_BSP          * Board specific commands
+               CONFIG_CMD_BOOTD          bootd
+               CONFIG_CMD_CACHE        * icache, dcache
+               CONFIG_CMD_CONSOLE        coninfo
+               CONFIG_CMD_DATE         * support for RTC, date/time...
+               CONFIG_CMD_DHCP         * DHCP support
+               CONFIG_CMD_DIAG         * Diagnostics
+               CONFIG_CMD_DOC          * Disk-On-Chip Support
+               CONFIG_CMD_DTT          * Digital Therm and Thermostat
+               CONFIG_CMD_ECHO           echo arguments
+               CONFIG_CMD_EEPROM       * EEPROM read/write support
+               CONFIG_CMD_ELF          * bootelf, bootvx
+               CONFIG_CMD_ENV            saveenv
+               CONFIG_CMD_FDC          * Floppy Disk Support
+               CONFIG_CMD_FAT          * FAT partition support
+               CONFIG_CMD_FDOS         * Dos diskette Support
+               CONFIG_CMD_FLASH          flinfo, erase, protect
+               CONFIG_CMD_FPGA           FPGA device initialization support
+               CONFIG_CMD_HWFLOW       * RTS/CTS hw flow control
+               CONFIG_CMD_I2C          * I2C serial bus support
+               CONFIG_CMD_IDE          * IDE harddisk support
+               CONFIG_CMD_IMI            iminfo
+               CONFIG_CMD_IMLS           List all found images
+               CONFIG_CMD_IMMAP        * IMMR dump support
+               CONFIG_CMD_IRQ          * irqinfo
+               CONFIG_CMD_ITEST          Integer/string test of 2 values
+               CONFIG_CMD_JFFS2        * JFFS2 Support
+               CONFIG_CMD_KGDB         * kgdb
+               CONFIG_CMD_LOADB          loadb
+               CONFIG_CMD_LOADS          loads
+               CONFIG_CMD_MEMORY         md, mm, nm, mw, cp, cmp, crc, base,
+                                         loop, loopw, mtest
+               CONFIG_CMD_MISC           Misc functions like sleep etc
+               CONFIG_CMD_MMC          * MMC memory mapped support
+               CONFIG_CMD_MII          * MII utility commands
+               CONFIG_CMD_NAND         * NAND support
+               CONFIG_CMD_NET            bootp, tftpboot, rarpboot
+               CONFIG_CMD_PCI          * pciinfo
+               CONFIG_CMD_PCMCIA               * PCMCIA support
+               CONFIG_CMD_PING         * send ICMP ECHO_REQUEST to network
+                                         host
+               CONFIG_CMD_PORTIO       * Port I/O
+               CONFIG_CMD_REGINFO      * Register dump
+               CONFIG_CMD_RUN            run command in env variable
+               CONFIG_CMD_SAVES        * save S record dump
+               CONFIG_CMD_SCSI         * SCSI Support
+               CONFIG_CMD_SDRAM        * print SDRAM configuration information
+                                         (requires CONFIG_CMD_I2C)
+               CONFIG_CMD_SETGETDCR      Support for DCR Register access
+                                         (4xx only)
+               CONFIG_CMD_SPI          * SPI serial bus support
+               CONFIG_CMD_USB          * USB support
+               CONFIG_CMD_VFD          * VFD support (TRAB)
+               CONFIG_CMD_BSP          * Board SPecific functions
+               CONFIG_CMD_CDP          * Cisco Discover Protocol support
+               CONFIG_CMD_FSL          * Microblaze FSL support
  
                EXAMPLE: If you want all functions except of network
                support you can write:
  
-               #define CONFIG_COMMANDS (CFG_CMD_ALL & ~CFG_CMD_NET)
+               #include "config_cmd_all.h"
+               #undef CONFIG_CMD_NET
  
        Other Commands:
                fdt (flattened device tree) command: CONFIG_OF_LIBFDT
  
        Note:   Don't enable the "icache" and "dcache" commands
-               (configuration option CFG_CMD_CACHE) unless you know
+               (configuration option CONFIG_CMD_CACHE) unless you know
                what you (and your U-Boot users) are doing. Data
                cache cannot be enabled on systems like the 8xx or
                8260 (where accesses to the IMMR region must be
  
  - Real-Time Clock:
  
-               When CFG_CMD_DATE is selected, the type of the RTC
+               When CONFIG_CMD_DATE is selected, the type of the RTC
                has to be selected, too. Define exactly one of the
                following options:
  
                When CONFIG_TIMESTAMP is selected, the timestamp
                (date and time) of an image is printed by image
                commands like bootm or iminfo. This option is
-               automatically enabled when you select CFG_CMD_DATE .
+               automatically enabled when you select CONFIG_CMD_DATE .
  
  - Partition Support:
                CONFIG_MAC_PARTITION and/or CONFIG_DOS_PARTITION
                and/or CONFIG_ISO_PARTITION
  
-               If IDE or SCSI support  is  enabled  (CFG_CMD_IDE  or
-               CFG_CMD_SCSI) you must configure support for at least
+               If IDE or SCSI support  is  enabled  (CONFIG_CMD_IDE or
+               CONFIG_CMD_SCSI) you must configure support for at least
                one partition type as well.
  
  - IDE Reset method:
                        CONFIG_USB_CONFIG
                                for differential drivers: 0x00001000
                                for single ended drivers: 0x00005000
 +                      CFG_USB_EVENT_POLL
 +                              May be defined to allow interrupt polling
 +                              instead of using asynchronous interrupts
 +
 +- USB Device:
 +              Define the below if you wish to use the USB console.
 +              Once firmware is rebuilt from a serial console issue the
 +              command "setenv stdin usbtty; setenv stdout usbtty" and
 +              attach your usb cable. The Unix command "dmesg" should print
 +              it has found a new device. The environment variable usbtty
 +              can be set to gserial or cdc_acm to enable your device to
 +              appear to a USB host as a Linux gserial device or a
 +              Common Device Class Abstract Control Model serial device.
 +              If you select usbtty = gserial you should be able to enumerate
 +              a Linux host by
 +              # modprobe usbserial vendor=0xVendorID product=0xProductID
 +              else if using cdc_acm, simply setting the environment
 +              variable usbtty to be cdc_acm should suffice. The following
 +              might be defined in YourBoardName.h
 +
 +                      CONFIG_USB_DEVICE
 +                      Define this to build a UDC device
 +
 +                      CONFIG_USB_TTY
 +                      Define this to have a tty type of device available to
 +                      talk to the UDC device
 +
 +                      CFG_CONSOLE_IS_IN_ENV
 +                      Define this if you want stdin, stdout &/or stderr to
 +                      be set to usbtty.
 +
 +                      mpc8xx:
 +                              CFG_USB_EXTC_CLK 0xBLAH
 +                              Derive USB clock from external clock "blah"
 +                              - CFG_USB_EXTC_CLK 0x02
 +
 +                              CFG_USB_BRG_CLK 0xBLAH
 +                              Derive USB clock from brgclk
 +                              - CFG_USB_BRG_CLK 0x04
 +
 +              If you have a USB-IF assigned VendorID then you may wish to
 +              define your own vendor specific values either in BoardName.h
 +              or directly in usbd_vendor_info.h. If you don't define
 +              CONFIG_USBD_MANUFACTURER, CONFIG_USBD_PRODUCT_NAME,
 +              CONFIG_USBD_VENDORID and CONFIG_USBD_PRODUCTID, then U-Boot
 +              should pretend to be a Linux device to it's target host.
 +
 +                      CONFIG_USBD_MANUFACTURER
 +                      Define this string as the name of your company for
 +                      - CONFIG_USBD_MANUFACTURER "my company"
 +
 +                      CONFIG_USBD_PRODUCT_NAME
 +                      Define this string as the name of your product
 +                      - CONFIG_USBD_PRODUCT_NAME "acme usb device"
 +
 +                      CONFIG_USBD_VENDORID
 +                      Define this as your assigned Vendor ID from the USB
 +                      Implementors Forum. This *must* be a genuine Vendor ID
 +                      to avoid polluting the USB namespace.
 +                      - CONFIG_USBD_VENDORID 0xFFFF
 +
 +                      CONFIG_USBD_PRODUCTID
 +                      Define this as the unique Product ID
 +                      for your device
 +                      - CONFIG_USBD_PRODUCTID 0xFFFF
  
  
  - MMC Support:
                enable this define CONFIG_MMC. The MMC can be
                accessed from the boot prompt by mapping the device
                to physical memory similar to flash. Command line is
-               enabled with CFG_CMD_MMC. The MMC driver also works with
-               the FAT fs. This is enabled with CFG_CMD_FAT.
+               enabled with CONFIG_CMD_MMC. The MMC driver also works with
+               the FAT fs. This is enabled with CONFIG_CMD_FAT.
  
  - Journaling Flash filesystem support:
                CONFIG_JFFS2_NAND, CONFIG_JFFS2_NAND_OFF, CONFIG_JFFS2_NAND_SIZE,
                boot, thus flooding the BOOTP server. Defining
                CONFIG_BOOTP_RANDOM_DELAY causes a random delay to be
                inserted before sending out BOOTP requests. The
-               following delays are insterted then:
+               following delays are inserted then:
  
                1st BOOTP request:      delay 0 ... 1 sec
                2nd BOOTP request:      delay 0 ... 2 sec
                BOOTP requests:         delay 0 ... 8 sec
  
  - DHCP Advanced Options:
-               CONFIG_BOOTP_MASK
-               You can fine tune the DHCP functionality by adding
-               these flags to the CONFIG_BOOTP_MASK define:
+               You can fine tune the DHCP functionality by defining
+               CONFIG_BOOTP_* symbols:
+               CONFIG_BOOTP_SUBNETMASK
+               CONFIG_BOOTP_GATEWAY
+               CONFIG_BOOTP_HOSTNAME
+               CONFIG_BOOTP_NISDOMAIN
+               CONFIG_BOOTP_BOOTPATH
+               CONFIG_BOOTP_BOOTFILESIZE
+               CONFIG_BOOTP_DNS
+               CONFIG_BOOTP_DNS2
+               CONFIG_BOOTP_SEND_HOSTNAME
+               CONFIG_BOOTP_NTPSERVER
+               CONFIG_BOOTP_TIMEOFFSET
+               CONFIG_BOOTP_VENDOREX
  
                CONFIG_BOOTP_DNS2 - If a DHCP client requests the DNS
                serverip from a DHCP server, it is possible that more
                serverip will be stored in the additional environment
                variable "dnsip2". The first DNS serverip is always
                stored in the variable "dnsip", when CONFIG_BOOTP_DNS
-               is added to the CONFIG_BOOTP_MASK.
+               is defined.
  
                CONFIG_BOOTP_SEND_HOSTNAME - Some DHCP servers are capable
                to do a dynamic update of a DNS server. To do this, they
                need the hostname of the DHCP requester.
-               If CONFIG_BOOP_SEND_HOSTNAME is added to the
-               CONFIG_BOOTP_MASK, the content of the "hostname"
-               environment variable is passed as option 12 to
-               the DHCP server.
+               If CONFIG_BOOP_SEND_HOSTNAME is defined, the content
+               of the "hostname" environment variable is passed as
+               option 12 to the DHCP server.
  
   - CDP Options:
                CONFIG_CDP_DEVICE_ID
                include the appropriate I2C driver for the selected cpu.
  
                This will allow you to use i2c commands at the u-boot
-               command line (as long as you set CFG_CMD_I2C in
+               command line (as long as you set CONFIG_CMD_I2C in
                CONFIG_COMMANDS) and communicate with i2c based realtime
                clock chips. See common/cmd_i2c.c for a description of the
                command line interface.
    -31 post/post.c             POST test failed, detected by post_output_backlog()
    -32 post/post.c             POST test failed, detected by post_run_single()
  
-    -1 common/cmd_doc.c        Bad usage of "doc" command
-    -1 common/cmd_doc.c        No boot device
-    -1 common/cmd_doc.c        Unknown Chip ID on boot device
-    -1 common/cmd_doc.c        Read Error on boot device
-    -1 common/cmd_doc.c        Image header has bad magic number
-    -1 common/cmd_ide.c        Bad usage of "ide" command
-    -1 common/cmd_ide.c        No boot device
-    -1 common/cmd_ide.c        Unknown boot device
-    -1 common/cmd_ide.c        Unknown partition table
-    -1 common/cmd_ide.c        Invalid partition type
-    -1 common/cmd_ide.c        Read Error on boot device
-    -1 common/cmd_ide.c        Image header has bad magic number
-    -1 common/cmd_nand.c       Bad usage of "nand" command
-    -1 common/cmd_nand.c       No boot device
-    -1 common/cmd_nand.c       Unknown Chip ID on boot device
-    -1 common/cmd_nand.c       Read Error on boot device
-    -1 common/cmd_nand.c       Image header has bad magic number
-    -1 common/env_common.c     Environment has a bad CRC, using default
+    34 common/cmd_doc.c        before loading a Image from a DOC device
+   -35 common/cmd_doc.c        Bad usage of "doc" command
+    35 common/cmd_doc.c        correct usage of "doc" command
+   -36 common/cmd_doc.c        No boot device
+    36 common/cmd_doc.c        correct boot device
+   -37 common/cmd_doc.c        Unknown Chip ID on boot device
+    37 common/cmd_doc.c        correct chip ID found, device available
+   -38 common/cmd_doc.c        Read Error on boot device
+    38 common/cmd_doc.c        reading Image header from DOC device OK
+   -39 common/cmd_doc.c        Image header has bad magic number
+    39 common/cmd_doc.c        Image header has correct magic number
+   -40 common/cmd_doc.c        Error reading Image from DOC device
+    40 common/cmd_doc.c        Image header has correct magic number
+    41 common/cmd_ide.c        before loading a Image from a IDE device
+   -42 common/cmd_ide.c        Bad usage of "ide" command
+    42 common/cmd_ide.c        correct usage of "ide" command
+   -43 common/cmd_ide.c        No boot device
+    43 common/cmd_ide.c        boot device found
+   -44 common/cmd_ide.c        Device not available
+    44 common/cmd_ide.c        Device available
+   -45 common/cmd_ide.c        wrong partition selected
+    45 common/cmd_ide.c        partition selected
+   -46 common/cmd_ide.c        Unknown partition table
+    46 common/cmd_ide.c        valid partition table found
+   -47 common/cmd_ide.c        Invalid partition type
+    47 common/cmd_ide.c        correct partition type
+   -48 common/cmd_ide.c        Error reading Image Header on boot device
+    48 common/cmd_ide.c        reading Image Header from IDE device OK
+   -49 common/cmd_ide.c        Image header has bad magic number
+    49 common/cmd_ide.c        Image header has correct magic number
+   -50 common/cmd_ide.c        Image header has bad     checksum
+    50 common/cmd_ide.c        Image header has correct checksum
+   -51 common/cmd_ide.c        Error reading Image from IDE device
+    51 common/cmd_ide.c        reading Image from IDE device OK
+    52 common/cmd_nand.c       before loading a Image from a NAND device
+   -53 common/cmd_nand.c       Bad usage of "nand" command
+    53 common/cmd_nand.c       correct usage of "nand" command
+   -54 common/cmd_nand.c       No boot device
+    54 common/cmd_nand.c       boot device found
+   -55 common/cmd_nand.c       Unknown Chip ID on boot device
+    55 common/cmd_nand.c       correct chip ID found, device available
+   -56 common/cmd_nand.c       Error reading Image Header on boot device
+    56 common/cmd_nand.c       reading Image Header from NAND device OK
+   -57 common/cmd_nand.c       Image header has bad magic number
+    57 common/cmd_nand.c       Image header has correct magic number
+   -58 common/cmd_nand.c       Error reading Image from NAND device
+    58 common/cmd_nand.c       reading Image from NAND device OK
+   -60 common/env_common.c     Environment has a bad CRC, using default
+    64 net/eth.c               starting with Ethernetconfiguration.
+   -64 net/eth.c               no Ethernet found.
+    65 net/eth.c               Ethernet found.
+   -80 common/cmd_net.c        usage wrong
+    80 common/cmd_net.c        before calling NetLoop()
+   -81 common/cmd_net.c        some error in NetLoop() occured
+    81 common/cmd_net.c        NetLoop() back without error
+   -82 common/cmd_net.c        size == 0 (File with size 0 loaded)
+    82 common/cmd_net.c        trying automatic boot
+    83 common/cmd_net.c        running autoscript
+   -83 common/cmd_net.c        some error in automatic boot or autoscript
+    84 common/cmd_net.c        end without errors
  
  Modem Support:
  --------------
@@@ -2394,7 -2372,7 +2438,7 @@@ Low Level (hardware related) configurat
  
  - CONFIG_LOOPW
                Add the "loopw" memory command. This only takes effect if
-               the memory commands are activated globally (CFG_CMD_MEM).
+               the memory commands are activated globally (CONFIG_CMD_MEM).
  
  - CONFIG_MX_CYCLIC
                Add the "mdc" and "mwc" memory commands. These are cyclic
                This command will write 12345678 to address 100 all 10 ms.
  
                This only takes effect if the memory commands are activated
-               globally (CFG_CMD_MEM).
+               globally (CONFIG_CMD_MEM).
  
  - CONFIG_SKIP_LOWLEVEL_INIT
  - CONFIG_SKIP_RELOCATE_UBOOT
diff --combined board/trab/auto_update.c
index 6f903d2b0376ec36a0f6d1709250bcd4061a336f,ef40c5474857a608ced29b27c4f7827ff7eccd46..92120b0d01ca8f0d3b779a19d059c4c922d18508
@@@ -34,7 -34,7 +34,7 @@@
  
  #ifdef CONFIG_AUTO_UPDATE
  
 -#ifndef CONFIG_USB_OHCI
 +#ifndef CONFIG_USB_OHCI_NEW
  #error "must define CONFIG_USB_OHCI"
  #endif
  
@@@ -46,8 -46,8 +46,8 @@@
  #error "must define CFG_HUSH_PARSER"
  #endif
  
- #if !(CONFIG_COMMANDS & CFG_CMD_FAT)
- #error "must define CFG_CMD_FAT"
+ #if !defined(CONFIG_CMD_FAT)
+ #error "must define CONFIG_CMD_FAT"
  #endif
  
  /*
diff --combined drivers/Makefile
index b8dc97b0aae9c6b8fc304709fcc8919c0a7e5205,881153ac9dd48e42c9b94428cfbee0a752cb6d0e..fc9804076233e07c5157c9a267148b8fddc4124a
@@@ -27,12 -27,12 +27,12 @@@ include $(TOPDIR)/config.m
  
  LIB   = $(obj)libdrivers.a
  
- COBJS = 3c589.o 5701rls.o ali512x.o atmel_usart.o \
+ COBJS = 3c589.o 5701rls.o ali512x.o ata_piix.o atmel_usart.o \
          bcm570x.o bcm570x_autoneg.o cfb_console.o cfi_flash.o \
          cs8900.o ct69000.o dataflash.o dc2114x.o dm9000x.o \
-         e1000.o eepro100.o \
+         e1000.o eepro100.o enc28j60.o \
 -        i8042.o inca-ip_sw.o keyboard.o \
 +        i8042.o inca-ip_sw.o isp116x-hcd.o keyboard.o \
-         lan91c96.o macb.o\
+         lan91c96.o macb.o \
          natsemi.o ne2000.o netarm_eth.o netconsole.o \
          ns16550.o ns8382x.o ns87308.o ns7520_eth.o omap1510_i2c.o \
          omap24xx_i2c.o pci.o pci_auto.o pci_indirect.o \
          status_led.o sym53c8xx.o systemace.o ahci.o \
          ti_pci1410a.o tigon3.o tsec.o \
          tsi108_eth.o tsi108_i2c.o tsi108_pci.o \
 -        usbdcore.o usbdcore_ep0.o usbdcore_omap1510.o usbtty.o \
 +        usb_ohci.o \
 +        usbdcore.o usbdcore_ep0.o usbdcore_mpc8xx.o usbdcore_omap1510.o \
 +        usbtty.o \
          videomodes.o w83c553f.o \
          ks8695eth.o \
          pxa_pcmcia.o mpc8xx_pcmcia.o tqm8xx_pcmcia.o  \
          rpx_pcmcia.o \
-         fsl_i2c.o
+         fsl_i2c.o fsl_pci_init.o ati_radeon_fb.o
  
  SRCS  := $(COBJS:.o=.c)
  OBJS  := $(addprefix $(obj),$(COBJS))
index 551a6099825926c8545c05672b8cc31fb5d3baa3,cc902c842d563f88cbb229beed3dab9f41b936d0..1a7167b481cd0a98f824f7892ccab3206a9c7135
  #define BOOTFLAG_COLD         0x01    /* Normal Power-On: Boot from FLASH  */
  #define BOOTFLAG_WARM         0x02    /* Software reboot           */
  
- #define CFG_CACHELINE_SIZE    32      /* For MPC5xxx CPUs */
- #if (CONFIG_COMMANDS & CFG_CMD_KGDB)
- #  define CFG_CACHELINE_SHIFT 5       /* log base 2 of the above value */
- #endif
  /*
   * Serial console configuration
   */
@@@ -69,7 -64,6 +64,6 @@@
  #define CONFIG_PCI_IO_BUS     0x50000000
  #define CONFIG_PCI_IO_PHYS    CONFIG_PCI_IO_BUS
  #define CONFIG_PCI_IO_SIZE    0x01000000
- #define ADD_PCI_CMD           CFG_CMD_PCI
  #endif
  
  #define CFG_XLB_PIPELINING    1
  #define CFG_RX_ETH_BUFFER     8  /* use 8 rx buffer on eepro100  */
  #define CONFIG_NS8382X                1
  
- #else /* MPC5100 */
+ #else
  #define CONFIG_MII            1
- #define ADD_PCI_CMD           0  /* no CFG_CMD_PCI */
  #endif
  
  /* Partitions */
  #define CONFIG_ISO_PARTITION
  
  /* USB */
 -#if 1
 -#define CONFIG_USB_OHCI
 +#define CONFIG_USB_OHCI_NEW
 +#define ADD_USB_CMD             CFG_CMD_USB | CFG_CMD_FAT
  #define CONFIG_USB_STORAGE
 -#endif
 +#define CFG_OHCI_BE_CONTROLLER
 +#undef CFG_USB_OHCI_BOARD_INIT
 +#define CFG_USB_OHCI_CPU_INIT 1
 +#define CFG_USB_OHCI_REGS_BASE        MPC5XXX_USB
 +#define CFG_USB_OHCI_SLOT_NAME        "mpc5200"
 +#define CFG_USB_OHCI_MAX_ROOT_PORTS   15
  
  #define       CONFIG_TIMESTAMP                /* Print image info with timestamp */
  
  /*
-  * Supported commands
+  * BOOTP options
   */
- #define CONFIG_COMMANDS              (CONFIG_CMD_DFL  | \
-                               CFG_CMD_EEPROM  | \
-                               CFG_CMD_FAT     | \
-                               CFG_CMD_I2C     | \
-                               CFG_CMD_IDE     | \
-                               CFG_CMD_NFS     | \
-                               CFG_CMD_SNTP    | \
-                               ADD_PCI_CMD     | \
-                               ADD_USB_CMD     )
- /* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
- #include <cmd_confdefs.h>
+ #define CONFIG_BOOTP_BOOTFILESIZE
+ #define CONFIG_BOOTP_BOOTPATH
+ #define CONFIG_BOOTP_GATEWAY
+ #define CONFIG_BOOTP_HOSTNAME
+ /*
+  * Command line configuration.
+  */
+ #include <config_cmd_default.h>
+ #define CONFIG_CMD_EEPROM
+ #define CONFIG_CMD_FAT
+ #define CONFIG_CMD_I2C
+ #define CONFIG_CMD_IDE
+ #define CONFIG_CMD_NFS
+ #define CONFIG_CMD_SNTP
+ #define CONFIG_CMD_USB
+ #if defined(CONFIG_PCI)
+ #define CONFIG_CMD_PCI
+ #endif
  
  #if (TEXT_BASE == 0xFF000000)         /* Boot low with 16 MB Flash */
  #   define CFG_LOWBOOT                1
   */
  #define CFG_LONGHELP                  /* undef to save memory     */
  #define CFG_PROMPT            "=> "   /* Monitor Command Prompt   */
- #if (CONFIG_COMMANDS & CFG_CMD_KGDB)
+ #if defined(CONFIG_CMD_KGDB)
  #define CFG_CBSIZE            1024    /* Console I/O Buffer Size  */
  #else
  #define CFG_CBSIZE            256     /* Console I/O Buffer Size  */
  
  #define CFG_HZ                        1000    /* decrementer freq: 1 ms ticks */
  
+ #define CFG_CACHELINE_SIZE    32      /* For MPC5xxx CPUs */
+ #if defined(CONFIG_CMD_KGDB)
+ #  define CFG_CACHELINE_SHIFT 5       /* log base 2 of the above value */
+ #endif
  /*
   * Various low-level settings
   */
index efac4c535d02f5c6dedb4d2cb11d4b6021c8c473,888af530c24e88b09a585505da389274e0a6d774..64dcbd010934d062f17b2677fb020e6ecfaa41f8
  
  #define CFG_RESET_ADDRESS    0xfff00100
  
- /*#undef CONFIG_PCI*/
- #define CONFIG_PCI
+ #define CONFIG_PCI            1       /* Enable PCI/PCIE */
+ #define CONFIG_PCI1           1       /* PCIE controler 1 (ULI bridge) */
+ #define CONFIG_PCI2           1       /* PCIE controler 2 (slot) */
+ #define CONFIG_FSL_PCI_INIT   1       /* Use common FSL init code */
  
  #define CONFIG_TSEC_ENET              /* tsec ethernet support */
  #define CONFIG_ENV_OVERWRITE
@@@ -76,6 -78,9 +78,9 @@@
  #define L2_ENABLE     (L2CR_L2E)
  
  #ifndef CONFIG_SYS_CLK_FREQ
+ #ifndef __ASSEMBLY__
+ extern unsigned long get_board_sys_clk(unsigned long dummy);
+ #endif
  #define CONFIG_SYS_CLK_FREQ     get_board_sys_clk(0)
  #endif
  
@@@ -93,6 -98,9 +98,9 @@@
  #define CFG_CCSRBAR           0xf8000000      /* relocated CCSRBAR */
  #define CFG_IMMR              CFG_CCSRBAR     /* PQII uses CFG_IMMR */
  
+ #define CFG_PCI1_ADDR         (CFG_CCSRBAR+0x8000)
+ #define CFG_PCI2_ADDR         (CFG_CCSRBAR+0x9000)
  /*
   * DDR Setup
   */
  #define CFG_INIT_SP_OFFSET    CFG_GBL_DATA_OFFSET
  
  #define CFG_MONITOR_LEN               (256 * 1024)    /* Reserve 256 kB for Mon */
- #define CFG_MALLOC_LEN                (128 * 1024)    /* Reserved for malloc */
+ #define CFG_MALLOC_LEN                (1024 * 1024)    /* Reserved for malloc */
  
  /* Serial Port */
  #define CONFIG_CONS_INDEX     1
  #define CFG_PCI1_MEM_BASE     0x80000000
  #define CFG_PCI1_MEM_PHYS     CFG_PCI1_MEM_BASE
  #define CFG_PCI1_MEM_SIZE     0x20000000      /* 512M */
- #define CFG_PCI1_IO_BASE      0xe2000000
- #define CFG_PCI1_IO_PHYS      CFG_PCI1_IO_BASE
- #define CFG_PCI1_IO_SIZE      0x1000000       /* 16M */
+ #define CFG_PCI1_IO_BASE      0x00000000
+ #define CFG_PCI1_IO_PHYS      0xe2000000
+ #define CFG_PCI1_IO_SIZE      0x00100000      /* 1M */
  
  /* PCI view of System Memory */
  #define CFG_PCI_MEMORY_BUS      0x00000000
  
  #define CFG_PCI2_MEM_BASE     0xa0000000
  #define CFG_PCI2_MEM_PHYS     CFG_PCI2_MEM_BASE
- #define CFG_PCI2_MEM_SIZE     0x10000000      /* 256M */
- #define CFG_PCI2_IO_BASE      0xe3000000
- #define CFG_PCI2_IO_PHYS      CFG_PCI2_IO_BASE
- #define CFG_PCI2_IO_SIZE      0x1000000       /* 16M */
+ #define CFG_PCI2_MEM_SIZE     0x20000000      /* 512M */
+ #define CFG_PCI2_IO_BASE      0x00000000
+ #define CFG_PCI2_IO_PHYS      0xe3000000
+ #define CFG_PCI2_IO_SIZE      0x00100000      /* 1M */
  
  #if defined(CONFIG_PCI)
  
  #undef CONFIG_EEPRO100
  #undef CONFIG_TULIP
  
 +/************************************************************
 + * USB support
 + ************************************************************/
 +#define CONFIG_PCI_OHCI               1
 +#define CONFIG_USB_OHCI_NEW           1
 +#define CONFIG_USB_KEYBOARD   1
 +#define CFG_DEVICE_DEREGISTER
 +#define CFG_USB_EVENT_POLL    1
 +#define CFG_USB_OHCI_SLOT_NAME        "ohci_pci"
 +#define CFG_USB_OHCI_MAX_ROOT_PORTS 15
 +
  #if !defined(CONFIG_PCI_PNP)
      #define PCI_ENET0_IOADDR  0xe0000000
      #define PCI_ENET0_MEMADDR 0xe0000000
      #define PCI_IDSEL_NUMBER  0x0c    /* slot0->3(IDSEL)=12->15 */
  #endif
  
+ /*PCIE video card used*/
+ #define VIDEO_IO_OFFSET               CFG_PCI2_IO_PHYS
+ /*PCI video card used*/
+ /*#define VIDEO_IO_OFFSET     CFG_PCI1_IO_PHYS*/
+ /* video */
+ #define CONFIG_VIDEO
+ #if defined(CONFIG_VIDEO)
+ #define CONFIG_BIOSEMU
+ #define CONFIG_CFB_CONSOLE
+ #define CONFIG_VIDEO_SW_CURSOR
+ #define CONFIG_VGA_AS_SINGLE_DEVICE
+ #define CONFIG_ATI_RADEON_FB
+ #define CONFIG_VIDEO_LOGO
+ /*#define CONFIG_CONSOLE_CURSOR*/
+ #define CFG_ISA_IO_BASE_ADDRESS CFG_PCI2_IO_PHYS
+ #endif
  #undef CONFIG_PCI_SCAN_SHOW           /* show pci devices on startup */
  
  #define CONFIG_DOS_PARTITION
  #define CFG_SCSI_MAXDEVICE    CFG_SCSI_MAX_DEVICE
  #endif
  
+ #define CONFIG_MPC86XX_PCI2
  #endif        /* CONFIG_PCI */
  
  #if defined(CONFIG_TSEC_ENET)
  
  #define CONFIG_MII            1       /* MII PHY management */
  
- #define CONFIG_MPC86XX_TSEC1    1
- #define CONFIG_MPC86XX_TSEC1_NAME       "eTSEC1"
- #define CONFIG_MPC86XX_TSEC2    1
- #define CONFIG_MPC86XX_TSEC2_NAME       "eTSEC2"
- #define CONFIG_MPC86XX_TSEC3    1
- #define CONFIG_MPC86XX_TSEC3_NAME       "eTSEC3"
- #define CONFIG_MPC86XX_TSEC4    1
- #define CONFIG_MPC86XX_TSEC4_NAME       "eTSEC4"
+ #define CONFIG_TSEC1    1
+ #define CONFIG_TSEC1_NAME       "eTSEC1"
+ #define CONFIG_TSEC2    1
+ #define CONFIG_TSEC2_NAME       "eTSEC2"
+ #define CONFIG_TSEC3    1
+ #define CONFIG_TSEC3_NAME       "eTSEC3"
+ #define CONFIG_TSEC4    1
+ #define CONFIG_TSEC4_NAME       "eTSEC4"
  
  #define TSEC1_PHY_ADDR                0
  #define TSEC2_PHY_ADDR                1
   * 0xa000_0000  512M   PCI-Express 2 Memory
   *    Changed it for operating from 0xd0000000
   */
- #define CFG_DBAT1L      ( CFG_PCI1_MEM_BASE | BATL_PP_RW \
+ #define CFG_DBAT1L      ( CFG_PCI1_MEM_PHYS | BATL_PP_RW \
                        | BATL_CACHEINHIBIT | BATL_GUARDEDSTORAGE)
- #define CFG_DBAT1U      (CFG_PCI1_MEM_BASE | BATU_BL_256M | BATU_VS | BATU_VP)
- #define CFG_IBAT1L      (CFG_PCI1_MEM_BASE | BATL_PP_RW | BATL_CACHEINHIBIT)
+ #define CFG_DBAT1U    (CFG_PCI1_MEM_PHYS | BATU_BL_1G | BATU_VS | BATU_VP)
+ #define CFG_IBAT1L    (CFG_PCI1_MEM_PHYS | BATL_PP_RW | BATL_CACHEINHIBIT)
  #define CFG_IBAT1U      CFG_DBAT1U
  
  /*
   * BAT2         512M   Cache-inhibited, guarded
   * 0xc000_0000  512M   RapidIO Memory
   */
- #define CFG_DBAT2L      (CFG_RIO_MEM_BASE | BATL_PP_RW \
+ #define CFG_DBAT2L      (CFG_RIO_MEM_PHYS | BATL_PP_RW \
                        | BATL_CACHEINHIBIT | BATL_GUARDEDSTORAGE)
- #define CFG_DBAT2U      (CFG_RIO_MEM_BASE | BATU_BL_512M | BATU_VS | BATU_VP)
- #define CFG_IBAT2L      (CFG_RIO_MEM_BASE | BATL_PP_RW | BATL_CACHEINHIBIT)
+ #define CFG_DBAT2U    (CFG_RIO_MEM_PHYS | BATU_BL_512M | BATU_VS | BATU_VP)
+ #define CFG_IBAT2L    (CFG_RIO_MEM_PHYS | BATL_PP_RW | BATL_CACHEINHIBIT)
  #define CFG_IBAT2U      CFG_DBAT2U
  
  /*
   * 0xe300_0000  16M    PCI-Express 2 I/0
   *    Note that this is at 0xe0000000
   */
- #define CFG_DBAT4L      ( CFG_PCI1_IO_BASE | BATL_PP_RW \
+ #define CFG_DBAT4L      ( CFG_PCI1_IO_PHYS | BATL_PP_RW \
                        | BATL_CACHEINHIBIT | BATL_GUARDEDSTORAGE)
- #define CFG_DBAT4U      (CFG_PCI1_IO_BASE | BATU_BL_32M | BATU_VS | BATU_VP)
- #define CFG_IBAT4L      (CFG_PCI1_IO_BASE | BATL_PP_RW | BATL_CACHEINHIBIT)
+ #define CFG_DBAT4U    (CFG_PCI1_IO_PHYS | BATU_BL_32M | BATU_VS | BATU_VP)
+ #define CFG_IBAT4L    (CFG_PCI1_IO_PHYS | BATL_PP_RW | BATL_CACHEINHIBIT)
  #define CFG_IBAT4U      CFG_DBAT4U
  
  /*
   */
  #ifndef CFG_RAMBOOT
      #define CFG_ENV_IS_IN_FLASH       1
-     #define CFG_ENV_ADDR              (CFG_MONITOR_BASE + 0x40000)
-     #define CFG_ENV_SECT_SIZE         0x40000 /* 256K(one sector) for env */
+     #define CFG_ENV_ADDR              (CFG_MONITOR_BASE + 0x60000)
+     #define CFG_ENV_SECT_SIZE         0x10000 /* 64K(one sector) for env */
      #define CFG_ENV_SIZE              0x2000
  #else
      #define CFG_ENV_IS_NOWHERE        1       /* Store ENV in memory only */
  #define CONFIG_LOADS_ECHO     1       /* echo on for serial download */
  #define CFG_LOADS_BAUD_CHANGE 1       /* allow baudrate change */
  
+ /*
+  * BOOTP options
+  */
+ #define CONFIG_BOOTP_BOOTFILESIZE
+ #define CONFIG_BOOTP_BOOTPATH
+ #define CONFIG_BOOTP_GATEWAY
+ #define CONFIG_BOOTP_HOSTNAME
+ /*
+  * Command line configuration.
+  */
+ #include <config_cmd_default.h>
+ #define CONFIG_CMD_PING
+ #define CONFIG_CMD_I2C
  #if defined(CFG_RAMBOOT)
-   #if defined(CONFIG_PCI)
-     #define  CONFIG_COMMANDS  ((CONFIG_CMD_DFL        \
-                                | CFG_CMD_PING         \
-                                | CFG_CMD_PCI          \
-                                | CFG_CMD_I2C          \
-                                | CFG_CMD_SCSI         \
-                                | CFG_CMD_USB          \
-                                | CFG_CMD_EXT2)        \
-                               &                       \
-                                ~(CFG_CMD_ENV))
-   #else
-     #define  CONFIG_COMMANDS  ((CONFIG_CMD_DFL        \
-                                | CFG_CMD_PING         \
-                                | CFG_CMD_I2C)         \
-                               &                       \
-                                ~(CFG_CMD_ENV))
-   #endif
- #else
-   #if defined(CONFIG_PCI)
-     #define  CONFIG_COMMANDS  (CONFIG_CMD_DFL         \
-                               | CFG_CMD_PCI           \
-                               | CFG_CMD_PING          \
-                               | CFG_CMD_I2C           \
-                               | CFG_CMD_SCSI          \
-                               | CFG_CMD_USB           \
-                               | CFG_CMD_EXT2)
-   #else
-     #define  CONFIG_COMMANDS  (CONFIG_CMD_DFL         \
-                               | CFG_CMD_PING          \
-                               | CFG_CMD_I2C)
-   #endif
+     #undef CONFIG_CMD_ENV
+ #endif
+ #if defined(CONFIG_PCI)
+     #define CONFIG_CMD_PCI
+     #define CONFIG_CMD_SCSI
+     #define CONFIG_CMD_EXT2
  #endif
  
- #include <cmd_confdefs.h>
  
  #undef CONFIG_WATCHDOG                        /* watchdog disabled */
  
  #define CFG_LOAD_ADDR 0x2000000       /* default load address */
  #define CFG_PROMPT    "=> "           /* Monitor Command Prompt */
  
- #if (CONFIG_COMMANDS & CFG_CMD_KGDB)
+ #if defined(CONFIG_CMD_KGDB)
      #define CFG_CBSIZE        1024            /* Console I/O Buffer Size */
  #else
      #define CFG_CBSIZE        256             /* Console I/O Buffer Size */
  /* Cache Configuration */
  #define CFG_DCACHE_SIZE               32768
  #define CFG_CACHELINE_SIZE    32
- #if (CONFIG_COMMANDS & CFG_CMD_KGDB)
#define CFG_CACHELINE_SHIFT   5       /*log base 2 of the above value*/
+ #if defined(CONFIG_CMD_KGDB)
    #define CFG_CACHELINE_SHIFT       5       /*log base 2 of the above value*/
  #endif
  
  /*
  #define BOOTFLAG_COLD 0x01            /* Normal Power-On: Boot from FLASH */
  #define BOOTFLAG_WARM 0x02            /* Software reboot */
  
- #if (CONFIG_COMMANDS & CFG_CMD_KGDB)
#define CONFIG_KGDB_BAUDRATE  230400  /* speed to run kgdb serial port */
#define CONFIG_KGDB_SER_INDEX 2       /* which serial port to use */
+ #if defined(CONFIG_CMD_KGDB)
    #define CONFIG_KGDB_BAUDRATE      230400  /* speed to run kgdb serial port */
    #define CONFIG_KGDB_SER_INDEX     2       /* which serial port to use */
  #endif
  
  /*
  #define CONFIG_HOSTNAME               unknown
  #define CONFIG_ROOTPATH               /opt/nfsroot
  #define CONFIG_BOOTFILE               uImage
+ #define CONFIG_UBOOTPATH      u-boot.bin      /* U-Boot image on TFTP server */
  
  #define CONFIG_SERVERIP               192.168.1.1
  #define CONFIG_GATEWAYIP      192.168.1.1
  
  #define       CONFIG_EXTRA_ENV_SETTINGS                                       \
     "netdev=eth0\0"                                                      \
+    "uboot=" MK_STR(CONFIG_UBOOTPATH) "\0"                             \
+    "tftpflash=tftpboot $loadaddr $uboot; "                    \
+       "protect off " MK_STR(TEXT_BASE) " +$filesize; "        \
+       "erase " MK_STR(TEXT_BASE) " +$filesize; "              \
+       "cp.b $loadaddr " MK_STR(TEXT_BASE) " $filesize; "      \
+       "protect on " MK_STR(TEXT_BASE) " +$filesize; "         \
+       "cmp.b $loadaddr " MK_STR(TEXT_BASE) " $filesize\0"     \
     "consoledev=ttyS0\0"                                                 \
     "ramdiskaddr=2000000\0"                                            \
     "ramdiskfile=your.ramdisk.u-boot\0"                                  \
-    "dtbaddr=400000\0"                                         \
+    "dtbaddr=c00000\0"                                         \
     "dtbfile=mpc8641_hpcn.dtb\0"                                  \
     "en-wd=mw.b f8100010 0x08; echo -expect:- 08; md.b f8100010 1\0" \
     "dis-wd=mw.b f8100010 0x00; echo -expect:- 00; md.b f8100010 1\0" \
index 1854fdc1fb7721a34503b127f71a6dde636cd0e6,63d77e2941aa618bf0cfd6fbb713769594c1c8b6..8360d8c0d7cbd2f89d346e4c1c034ee7ec325070
  
  #define CFG_MPC5XXX_CLKIN     33000000 /* ... running at 33.000000MHz         */
  
- #define BOOTFLAG_COLD         0x01    /* Normal Power-On: Boot from FLASH     */
+ #define BOOTFLAG_COLD         0x01    /* Normal Power-On: Boot from FLASH     */
  #define BOOTFLAG_WARM         0x02    /* Software reboot                      */
  
- #define CFG_CACHELINE_SIZE    32      /* For MPC5xxx CPUs                     */
- #if (CONFIG_COMMANDS & CFG_CMD_KGDB)
- #  define CFG_CACHELINE_SHIFT 5       /* log base 2 of the above value        */
- #endif
  /*
   * Serial console configuration
   */
  #define CONFIG_NS8382X                1
  #endif        /* CONFIG_STK52XX */
  
- #ifdef CONFIG_PCI
- #define ADD_PCI_CMD           CFG_CMD_PCI
- #else
- #define ADD_PCI_CMD           0
- #endif
  /*
   * Video console
   */
  #define CFG_CONSOLE_IS_IN_ENV
  #endif /* #ifndef CONFIG_TQM5200S */
  
- #ifdef CONFIG_VIDEO
- #define ADD_BMP_CMD           CFG_CMD_BMP
- #else
- #define ADD_BMP_CMD           0
- #endif
  
  /* Partitions */
  #define CONFIG_MAC_PARTITION
  
  /* USB */
  #if defined(CONFIG_STK52XX) || defined(CONFIG_FO300)
 -#define CONFIG_USB_OHCI
 +#define CONFIG_USB_OHCI_NEW
 +#define ADD_USB_CMD           CFG_CMD_USB | CFG_CMD_FAT
  #define CONFIG_USB_STORAGE
 +
 +#undef CFG_USB_OHCI_BOARD_INIT
 +#define CFG_USB_OHCI_CPU_INIT
 +#define CFG_USB_OHCI_REGS_BASE        MPC5XXX_USB
 +#define CFG_USB_OHCI_SLOT_NAME        "mpc5200"
 +#define CFG_USB_OHCI_MAX_ROOT_PORTS   15
 +
 +#else
 +#define ADD_USB_CMD           0
  #endif
  
  #ifndef CONFIG_CAM5200
  #endif
  
  #ifdef CONFIG_POST
- #define CFG_CMD_POST_DIAG CFG_CMD_DIAG
  /* preserve space for the post_word at end of on-chip SRAM */
  #define MPC5XXX_SRAM_POST_SIZE MPC5XXX_SRAM_SIZE-4
- #else
- #define CFG_CMD_POST_DIAG 0
  #endif
  
- /* IDE */
- #if defined (CONFIG_MINIFAP) || defined (CONFIG_STK52XX) || defined(CONFIG_FO300)
- #define ADD_IDE_CMD           (CFG_CMD_IDE | CFG_CMD_FAT | CFG_CMD_EXT2)
- #else
- #define ADD_IDE_CMD           0
- #endif
  
  /*
-  * Supported commands
+  * BOOTP options
   */
- #define CONFIG_COMMANDS              (CONFIG_CMD_DFL  | \
-                               ADD_BMP_CMD     | \
-                               ADD_IDE_CMD     | \
-                               ADD_PCI_CMD     | \
-                               ADD_USB_CMD     | \
-                               CFG_CMD_ASKENV  | \
-                               CFG_CMD_DATE    | \
-                               CFG_CMD_DHCP    | \
-                               CFG_CMD_EEPROM  | \
-                               CFG_CMD_I2C     | \
-                               CFG_CMD_JFFS2   | \
-                               CFG_CMD_MII     | \
-                               CFG_CMD_NFS     | \
-                               CFG_CMD_PING    | \
-                               CFG_CMD_POST_DIAG | \
-                               CFG_CMD_REGINFO | \
-                               CFG_CMD_SNTP    | \
-                               CFG_CMD_BSP)
- /* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
- #include <cmd_confdefs.h>
+ #define CONFIG_BOOTP_BOOTFILESIZE
+ #define CONFIG_BOOTP_BOOTPATH
+ #define CONFIG_BOOTP_GATEWAY
+ #define CONFIG_BOOTP_HOSTNAME
+ /*
+  * Command line configuration.
+  */
+ #include <config_cmd_default.h>
+ #define CONFIG_CMD_ASKENV
+ #define CONFIG_CMD_DATE
+ #define CONFIG_CMD_DHCP
+ #define CONFIG_CMD_EEPROM
+ #define CONFIG_CMD_I2C
+ #define CONFIG_CMD_JFFS2
+ #define CONFIG_CMD_MII
+ #define CONFIG_CMD_NFS
+ #define CONFIG_CMD_PING
+ #define CONFIG_CMD_REGINFO
+ #define CONFIG_CMD_SNTP
+ #define CONFIG_CMD_BSP
+ #ifdef CONFIG_VIDEO
+     #define CONFIG_CMD_BMP
+ #endif
+ #ifdef CONFIG_PCI
+ #define CONFIG_CMD_CMD_PCI
+ #endif
+ #if defined(CONFIG_MINIFAP) || defined(CONFIG_STK52XX) || defined(CONFIG_FO300)
+     #define CONFIG_CMD_IDE
+     #define CONFIG_CMD_FAT
+     #define CONFIG_CMD_EXT2
+ #endif
+ #if defined(CONFIG_STK52XX) || defined(CONFIG_FO300)
+     #define CONFIG_CFG_USB
+     #define CONFIG_CFG_FAT
+ #endif
+ #ifdef CONFIG_POST
+     #define CONFIG_CMD_DIAG
+ #endif
  
  #define       CONFIG_TIMESTAMP                /* display image timestamps */
  
  #ifndef CONFIG_CAM5200
  #define CUSTOM_ENV_SETTINGS                                           \
        "bootfile=/tftpboot/tqm5200/uImage\0"                           \
+       "bootfile_fdt=/tftpboot/tqm5200/uImage_fdt\0"                   \
+       "fdt_file=/tftpboot/tqm5200/tqm5200.dtb\0"                      \
        "u-boot=/tftpboot/tqm5200/u-boot.bin\0"
  #else
- #define CUSTOM_ENV_SETTINGS                                           \
+ #define CUSTOM_ENV_SETTINGS                                           \
        "bootfile=cam5200/uImage\0"                                     \
        "u-boot=cam5200/u-boot.bin\0"                                   \
        "setup=tftp 200000 cam5200/setup.img; autoscr 200000\0"
  #endif
  
  #define CONFIG_EXTRA_ENV_SETTINGS                                     \
+       "console=ttyS0\0"                                               \
+       "kernel_addr=200000\0"                                          \
+       "fdt_addr=400000\0"                                             \
+       "hostname=tqm5200\0"                                            \
        "netdev=eth0\0"                                                 \
        "rootpath=/opt/eldk/ppc_6xx\0"                                  \
        "ramargs=setenv bootargs root=/dev/ram rw\0"                    \
                "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}"      \
                ":${hostname}:${netdev}:off panic=1\0"                  \
        "addcons=setenv bootargs ${bootargs} "                          \
-               "console=ttyS0,${baudrate}\0"                           \
+               "console=${console},${baudrate}\0"                      \
        "flash_self=run ramargs addip addcons;"                         \
                "bootm ${kernel_addr} ${ramdisk_addr}\0"                \
        "flash_nfs=run nfsargs addip addcons;"                          \
                "bootm ${kernel_addr}\0"                                \
-       "net_nfs=tftp 200000 ${bootfile};run nfsargs addip addcons;"    \
-               "bootm\0"                                               \
+       "net_nfs=tftp ${kernel_addr} ${bootfile};"                      \
+               "run nfsargs addip addcons;bootm\0"                     \
+       "net_nfs_fdt=tftp ${kernel_addr} ${bootfile_fdt};"              \
+               "tftp ${fdt_addr} ${fdt_file};setenv console ttyPSC0;"  \
+               "run nfsargs addip addcons;"                            \
+               "bootm ${kernel_addr} - ${fdt_addr}\0"                  \
        CUSTOM_ENV_SETTINGS                                             \
        "load=tftp 200000 ${u-boot}\0"                                  \
        ENV_UPDT                                                        \
  #define       CFG_HUSH_PARSER         1       /* use "hush" command parser    */
  #define       CFG_PROMPT_HUSH_PS2     "> "
  
- #if (CONFIG_COMMANDS & CFG_CMD_KGDB)
+ #define CFG_CACHELINE_SIZE    32      /* For MPC5xxx CPUs */
+ #if defined(CONFIG_CMD_KGDB)
+ #define CFG_CACHELINE_SHIFT   5       /* log base 2 of the above value */
+ #endif
+ #if defined(CONFIG_CMD_KGDB)
  #define CFG_CBSIZE            1024    /* Console I/O Buffer Size  */
  #else
  #define CFG_CBSIZE            256     /* Console I/O Buffer Size  */
  #define CFG_HZ                        1000    /* decrementer freq: 1 ms ticks */
  
  /*
-  * Enable loopw commando. This has only affect, if CFG_CMD_MEM is defined,
-  * which is normally part of the default commands (CFV_CMD_DFL)
+  * Enable loopw command.
   */
  #define CONFIG_LOOPW
  
  /* Interval between registers                                              */
  #define CFG_ATA_STRIDE                4
  
+ /*-----------------------------------------------------------------------
+  * Open firmware flat tree support
+  *-----------------------------------------------------------------------
+  */
+ #define CONFIG_OF_FLAT_TREE   1
+ #define CONFIG_OF_BOARD_SETUP 1
+ /* maximum size of the flat tree (8K) */
+ #define OF_FLAT_TREE_MAX_SIZE 8192
+ #define OF_CPU                        "PowerPC,5200@0"
+ #define OF_SOC                        "soc5200@f0000000"
+ #define OF_TBCLK              (bd->bi_busfreq / 4)
+ #define OF_STDOUT_PATH                "/soc5200@f0000000/serial@2000"
  #endif /* __CONFIG_H */
diff --combined include/configs/delta.h
index 25ba06e5d930487889c99caed47d113f01a2094d,dbfe7a702b54bc61b75da1375efa33be048c571b..09667edaa5a51754daed85157668d1d4c4d4b5cb
  
  #define CONFIG_BAUDRATE               115200
  
- /* #define CONFIG_COMMANDS       (CONFIG_CMD_DFL | CFG_CMD_MMC | CFG_CMD_FAT) */
+ /*
+  * BOOTP options
+  */
+ #define CONFIG_BOOTP_BOOTFILESIZE
+ #define CONFIG_BOOTP_BOOTPATH
+ #define CONFIG_BOOTP_GATEWAY
+ #define CONFIG_BOOTP_HOSTNAME
+ /*
+  * Command line configuration.
+  */
+ #include <config_cmd_default.h>
  #ifdef TURN_ON_ETHERNET
- # define CONFIG_COMMANDS        (CONFIG_CMD_DFL | CFG_CMD_PING)
+ #define CONFIG_CMD_PING
  #else
- # define CONFIG_COMMANDS      ((CONFIG_CMD_DFL \
-                                 | CFG_CMD_ENV \
-                                 | CFG_CMD_NAND \
-                                 | CFG_CMD_I2C \
-                                 | CFG_CMD_USB \
-                                 | CFG_CMD_FAT) \
-                                & ~(CFG_CMD_NET \
-                                    | CFG_CMD_FLASH \
-                                    | CFG_CMD_IMLS))
+ #define CONFIG_CMD_ENV
+ #define CONFIG_CMD_NAND
+ #define CONFIG_CMD_I2C
+ #undef CONFIG_CMD_NET
+ #undef CONFIG_CMD_FLASH
+ #undef CONFIG_CMD_IMLS
  #endif
  
 +/* USB */
 +#define CONFIG_USB_OHCI_NEW   1
 +#define CONFIG_USB_STORAGE      1
 +#define CONFIG_DOS_PARTITION    1
 +
 +#undef CFG_USB_OHCI_BOARD_INIT
 +#define CFG_USB_OHCI_CPU_INIT 1
 +#define CFG_USB_OHCI_REGS_BASE        OHCI_REGS_BASE
 +#define CFG_USB_OHCI_SLOT_NAME        "delta"
 +#define CFG_USB_OHCI_MAX_ROOT_PORTS   3
 +
 +#define LITTLEENDIAN            1       /* used by usb_ohci.c  */
  
- /* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
- #include <cmd_confdefs.h>
  #define CONFIG_BOOTDELAY      -1
  #define CONFIG_ETHADDR                08:00:3e:26:0a:5b
  #define CONFIG_NETMASK                255.255.0.0
  #define CONFIG_CMDLINE_TAG
  #define CONFIG_TIMESTAMP
  
- #if (CONFIG_COMMANDS & CFG_CMD_KGDB)
+ #if defined(CONFIG_CMD_KGDB)
  #define CONFIG_KGDB_BAUDRATE  230400          /* speed to run kgdb serial port */
  #define CONFIG_KGDB_SER_INDEX 2               /* which serial port to use */
  #endif
diff --combined include/configs/mp2usb.h
index 2cf78a3b150b314f38a1ca1845296b83602299aa,8d6f2613c17434cd87d2f22cd3a5681d8cba623a..ea5a44b1d1e0a8aec51f7893bba026125c396d22
  
  #undef        CONFIG_MODEM_SUPPORT            /* disable modem initialization stuff */
  
 -#define CONFIG_USB_OHCI               1
 +#define CONFIG_USB_OHCI_NEW   1
  #define CONFIG_USB_KEYBOARD   1
  #define CONFIG_USB_STORAGE    1
  #define CONFIG_DOS_PARTITION  1
  #define CONFIG_AT91C_PQFP_UHPBUG 1
  
 +#undef CFG_USB_OHCI_BOARD_INIT
 +#define CFG_USB_OHCI_CPU_INIT         1
 +#define CFG_USB_OHCI_REGS_BASE                AT91_USB_HOST_BASE
 +#define CFG_USB_OHCI_SLOT_NAME                "at91rm9200"
 +#define CFG_USB_OHCI_MAX_ROOT_PORTS   15
 +
  #undef CONFIG_HARD_I2C
  
  #ifdef CONFIG_HARD_I2C
  
  #define CONFIG_BOOTDELAY      3
  
- #ifdef CONFIG_HARD_I2C
- #define CONFIG_COMMANDS               \
-                      ((CONFIG_CMD_DFL | \
-                       CFG_CMD_DATE    | \
-                       CFG_CMD_DHCP    | \
-                       CFG_CMD_EEPROM  | \
-                       CFG_CMD_I2C     | \
-                       CFG_CMD_NFS     | \
-                       CFG_CMD_SNTP    | \
-                       CFG_CMD_MISC))
- #else
- #define CONFIG_COMMANDS               \
-                      ((CONFIG_CMD_DFL | \
-                       CFG_CMD_DHCP    | \
-                       CFG_CMD_NFS     | \
-                       CFG_CMD_SNTP    | \
-                       CFG_CMD_USB      | \
-                       CFG_CMD_CACHE)  & \
-                     ~(CFG_CMD_BDI | \
-                       CFG_CMD_IMI | \
-                       CFG_CMD_AUTOSCRIPT | \
-                       CFG_CMD_FPGA | \
-                       CFG_CMD_MISC | \
-                       CFG_CMD_LOADS ))
 -
+ #if !defined(CONFIG_HARD_I2C)
  #define CONFIG_TIMESTAMP
  #endif
- #define CFG_LONGHELP
  
- /* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
- #include <cmd_confdefs.h>
+ /*
+  * BOOTP options
+  */
+ #define CONFIG_BOOTP_BOOTFILESIZE
+ #define CONFIG_BOOTP_BOOTPATH
+ #define CONFIG_BOOTP_GATEWAY
+ #define CONFIG_BOOTP_HOSTNAME
+ /*
+  * Command line configuration.
+  */
+ #include <config_cmd_default.h>
+ #define CONFIG_CMD_DHCP
+ #define CONFIG_CMD_NFS
+ #define CONFIG_CMD_SNTP
+ #if defined(CONFIG_HARD_I2C)
+     #define CONFIG_CMD_DATE
+     #define CONFIG_CMD_EEPROM
+     #define CONFIG_CMD_I2C
+     #define CONFIG_CMD_MISC
+ #else
+     #define CONFIG_CMD_USB
+     #define CONFIG_CMD_CACHE
+     #undef CONFIG_CMD_AUTOSCRIPT
+     #undef CONFIG_CMD_BDI
+     #undef CONFIG_CMD_FPGA
+     #undef CONFIG_CMD_IMI
+     #undef CONFIG_CMD_LOADS
+     #undef CONFIG_CMD_MISC
+ #endif
+ #define CFG_LONGHELP
  
  #define CONFIG_NR_DRAM_BANKS  1
  #define PHYS_SDRAM            0x20000000
 -#define PHYS_SDRAM_SIZE               0x08000000      /* 128 megs */
 +#define PHYS_SDRAM_SIZE               0x08000000      /* 128 megs */
  
  #define CFG_MEMTEST_START     PHYS_SDRAM
  #define CFG_MEMTEST_END               CFG_MEMTEST_START + PHYS_SDRAM_SIZE - 262144
diff --combined include/configs/trab.h
index f52d2de4b4d255d05a627bb666ba086e3b1e2e80,52bcbfc158b5895d0d80881f2b7a1c8fa5853696..dbccea28ad364dbde5e92ed0ad7fa5a5d02463ad
  #define CFG_EEPROM_PAGE_WRITE_DELAY_MS 10
  
  /* USB stuff */
 -#define CONFIG_USB_OHCI               1
 +#define CONFIG_USB_OHCI_NEW   1
  #define CONFIG_USB_STORAGE    1
  #define CONFIG_DOS_PARTITION  1
  
 +#undef CFG_USB_OHCI_BOARD_INIT
 +#define CFG_USB_OHCI_CPU_INIT 1
 +
 +#define CFG_USB_OHCI_REGS_BASE        0x14200000
 +#define CFG_USB_OHCI_SLOT_NAME        "s3c2400"
 +#define CFG_USB_OHCI_MAX_ROOT_PORTS   15
 +
  /*
   * Size of malloc() pool
   */
  /* Use s3c2400's RTC */
  #define CONFIG_RTC_S3C24X0    1
  
+ /*
+  * BOOTP options
+  */
+ #define CONFIG_BOOTP_BOOTFILESIZE
+ #define CONFIG_BOOTP_BOOTPATH
+ #define CONFIG_BOOTP_GATEWAY
+ #define CONFIG_BOOTP_HOSTNAME
+ /*
+  * Command line configuration.
+  */
+ #include <config_cmd_default.h>
+ #define CONFIG_CMD_BSP
+ #define CONFIG_CMD_DATE
+ #define CONFIG_CMD_DHCP
+ #define CONFIG_CMD_FAT
+ #define CONFIG_CMD_NFS
+ #define CONFIG_CMD_SNTP
+ #define CONFIG_CMD_USB
  #ifdef CONFIG_HWFLOW
- #define CONFIG_COMMANDS_ADD_HWFLOW    CFG_CMD_HWFLOW
- #else
- #define       CONFIG_COMMANDS_ADD_HWFLOW      0
+     #define CONFIG_CMD_HWFLOW
  #endif
  
  #ifdef        CONFIG_VFD
- #define CONFIG_COMMANDS_ADD_VFD               CFG_CMD_VFD
- #else
- #define CONFIG_COMMANDS_ADD_VFD               0
+     #define CONFIG_CMD_VFD
  #endif
  
  #ifdef CONFIG_DRIVER_S3C24X0_I2C
- #define CONFIG_COMMANDS_ADD_EEPROM    CFG_CMD_EEPROM
- #define CONFIG_COMMANDS_I2C           CFG_CMD_I2C
- #else
- #define CONFIG_COMMANDS_ADD_EEPROM    0
- #define CONFIG_COMMANDS_I2C           0
+     #define CONFIG_CMD_EEPROM
+     #define CONFIG_CMD_I2C
  #endif
  
  #ifndef USE_920T_MMU
- #define CONFIG_COMMANDS              ((CONFIG_CMD_DFL & ~CFG_CMD_CACHE) | \
-                               CONFIG_COMMANDS_ADD_HWFLOW      | \
-                               CONFIG_COMMANDS_ADD_VFD         | \
-                               CONFIG_COMMANDS_ADD_EEPROM      | \
-                               CONFIG_COMMANDS_I2C             | \
-                               CFG_CMD_BSP                     | \
-                               CFG_CMD_DATE                    | \
-                               CFG_CMD_DHCP                    | \
-                               CFG_CMD_FAT                     | \
-                               CFG_CMD_NFS                     | \
-                               CFG_CMD_SNTP                    | \
-                               CFG_CMD_USB     )
- #else
- #define CONFIG_COMMANDS              (CONFIG_CMD_DFL                  | \
-                               CONFIG_COMMANDS_ADD_HWFLOW      | \
-                               CONFIG_COMMANDS_ADD_VFD         | \
-                               CONFIG_COMMANDS_ADD_EEPROM      | \
-                               CONFIG_COMMANDS_I2C             | \
-                               CFG_CMD_BSP                     | \
-                               CFG_CMD_DATE                    | \
-                               CFG_CMD_DHCP                    | \
-                               CFG_CMD_FAT                     | \
-                               CFG_CMD_NFS                     | \
-                               CFG_CMD_SNTP                    | \
-                               CFG_CMD_USB     )
+     #undef CONFIG_CMD_CACHE
  #endif
  
  /* moved up */
  #define CFG_HUSH_PARSER               1       /* use "hush" command parser    */
  
- /* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
- #include <cmd_confdefs.h>
  #define CONFIG_BOOTDELAY      5
  #define CONFIG_ZERO_BOOTDELAY_CHECK   /* allow to break in always */
  #define CONFIG_PREBOOT                "echo;echo *** booting ***;echo"
  #define CONFIG_AUTOBOOT_DELAY_STR     "R"     /* 1st "password"       */
  #endif
  
- #if (CONFIG_COMMANDS & CFG_CMD_KGDB)
+ #if defined(CONFIG_CMD_KGDB)
  #define CONFIG_KGDB_BAUDRATE  115200          /* speed to run kgdb serial port */
  /* what's this ? it's not used anywhere */
  #define CONFIG_KGDB_SER_INDEX 1               /* which serial port to use */
index 1d127581ee660515b294a0e401c7fd80d0ea6059,dd6d9acdd5de4163f8471289286d07e8fd60f9de..6a5b7f1eaacd4b38e07d22f56757e22a784c57e3
@@@ -38,6 -38,7 +38,7 @@@
  #define CONFIG_440GR          1       /* Specific PPC440GR support    */
  #define CONFIG_HOSTNAME               yellowstone
  #endif
+ #define CONFIG_440            1       /* ... PPC440 family            */
  #define CONFIG_4xx            1       /* ... PPC4xx family            */
  #define CONFIG_SYS_CLK_FREQ   66666666    /* external freq to pll     */
  
  #define CFG_FLASH_EMPTY_INFO          /* print 'E' for empty sector on flinfo */
  
  #ifdef CFG_ENV_IS_IN_FLASH
- #define CFG_ENV_SECT_SIZE     0x20000         /* size of one complete sector  */
+ #define CFG_ENV_SECT_SIZE     0x20000 /* size of one complete sector          */
  #define CFG_ENV_ADDR          (CFG_MONITOR_BASE-CFG_ENV_SECT_SIZE)
  #define       CFG_ENV_SIZE            0x2000  /* Total Size of Environment Sector     */
  
  
  #ifdef CONFIG_440EP
  /* USB */
 -#define CONFIG_USB_OHCI
 +#define CONFIG_USB_OHCI_NEW
  #define CONFIG_USB_STORAGE
 +#define CFG_OHCI_BE_CONTROLLER
 +
 +#undef CFG_USB_OHCI_BOARD_INIT
 +#define CFG_USB_OHCI_CPU_INIT 1
 +#define CFG_USB_OHCI_REGS_BASE        (CFG_PERIPHERAL_BASE | 0x1000)
 +#define CFG_USB_OHCI_SLOT_NAME        "ppc440"
 +#define CFG_USB_OHCI_MAX_ROOT_PORTS   15
  
  /* Comment this out to enable USB 1.1 device */
  #define USB_2_0_DEVICE
  
- #define CMD_USB                       (CFG_CMD_USB | CFG_CMD_FAT | CFG_CMD_EXT2)
  #define CONFIG_SUPPORT_VFAT
- #else
- #define CMD_USB                       0       /* no USB on 440GR              */
  #endif /* CONFIG_440EP */
  
  #ifdef DEBUG
  #define CONFIG_HW_WATCHDOG                    /* watchdog */
  #endif
  
- #define CONFIG_COMMANDS              (CONFIG_CMD_DFL  | \
-                               CFG_CMD_ASKENV  | \
-                               CFG_CMD_DHCP    | \
-                               CFG_CMD_DIAG    | \
-                               CFG_CMD_ELF     | \
-                               CFG_CMD_EEPROM  | \
-                               CFG_CMD_I2C     | \
-                               CFG_CMD_IRQ     | \
-                               CFG_CMD_MII     | \
-                               CFG_CMD_NET     | \
-                               CFG_CMD_NFS     | \
-                               CFG_CMD_PCI     | \
-                               CFG_CMD_PING    | \
-                               CFG_CMD_REGINFO | \
-                               CFG_CMD_SDRAM   | \
-                               CMD_USB)
- /* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
- #include <cmd_confdefs.h>
+ /*
+  * BOOTP options
+  */
+ #define CONFIG_BOOTP_BOOTFILESIZE
+ #define CONFIG_BOOTP_BOOTPATH
+ #define CONFIG_BOOTP_GATEWAY
+ #define CONFIG_BOOTP_HOSTNAME
+ /*
+  * Command line configuration.
+  */
+ #include <config_cmd_default.h>
+ #define CONFIG_CMD_ASKENV
+ #define CONFIG_CMD_DHCP
+ #define CONFIG_CMD_DIAG
+ #define CONFIG_CMD_ELF
+ #define CONFIG_CMD_EEPROM
+ #define CONFIG_CMD_I2C
+ #define CONFIG_CMD_IRQ
+ #define CONFIG_CMD_MII
+ #define CONFIG_CMD_NET
+ #define CONFIG_CMD_NFS
+ #define CONFIG_CMD_PCI
+ #define CONFIG_CMD_PING
+ #define CONFIG_CMD_REGINFO
+ #define CONFIG_CMD_SDRAM
+ #ifdef CONFIG_440EP
+     #define CONFIG_CMD_USB
+     #define CONFIG_CMD_FAT
+     #define CONFIG_CMD_EXT2
+ #endif
  
  /*
   * Miscellaneous configurable options
   */
  #define CFG_LONGHELP                  /* undef to save memory         */
  #define CFG_PROMPT            "=> "   /* Monitor Command Prompt       */
- #if (CONFIG_COMMANDS & CFG_CMD_KGDB)
+ #if defined(CONFIG_CMD_KGDB)
  #define CFG_CBSIZE            1024    /* Console I/O Buffer Size      */
  #else
  #define CFG_CBSIZE            256     /* Console I/O Buffer Size      */
  #define CFG_PCI_TARGBASE        0x80000000 /* PCIaddr mapped to CFG_PCI_MEMBASE*/
  
  /* Board-specific PCI */
- #define CFG_PCI_PRE_INIT                /* enable board pci_pre_init()  */
  #define CFG_PCI_TARGET_INIT
  #define CFG_PCI_MASTER_INIT
  
   */
  #define CFG_DCACHE_SIZE               (32<<10) /* For AMCC 440 CPUs                   */
  #define CFG_CACHELINE_SIZE    32      /* ...                  */
- #if (CONFIG_COMMANDS & CFG_CMD_KGDB)
+ #if defined(CONFIG_CMD_KGDB)
  #define CFG_CACHELINE_SHIFT   5       /* log base 2 of the above value        */
  #endif
  
  #define BOOTFLAG_COLD 0x01            /* Normal Power-On: Boot from FLASH     */
  #define BOOTFLAG_WARM 0x02            /* Software reboot                      */
  
- #if (CONFIG_COMMANDS & CFG_CMD_KGDB)
+ #if defined(CONFIG_CMD_KGDB)
  #define CONFIG_KGDB_BAUDRATE  230400  /* speed to run kgdb serial port */
  #define CONFIG_KGDB_SER_INDEX 2       /* which serial port to use */
  #endif