Merge with git://www.denx.de/git/u-boot.git

diff --cc Makefile
Simple merge

diff --cc README
Simple merge

diff --cc board/trab/auto_update.c
Simple merge

diff --cc drivers/Makefile
index b8dc97b,881153a..fc98040
--- 1/drivers/Makefile
--- 2/drivers/Makefile
+++ b/drivers/Makefile
@@@ -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 \

diff --cc include/configs/IceCube.h
Simple merge

diff --cc include/configs/MPC8641HPCN.h
Simple merge

diff --cc include/configs/TQM5200.h
Simple merge

diff --cc include/configs/delta.h
index 25ba06e,dbfe7a7..09667ed
--- 1/include/configs/delta.h
--- 2/include/configs/delta.h
+++ b/include/configs/delta.h
@@@ -87,37 -87,38 +87,50 @@@
  
  #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

diff --cc include/configs/mp2usb.h
index 2cf78a3,8d6f261..ea5a44b
--- 1/include/configs/mp2usb.h
--- 2/include/configs/mp2usb.h
+++ b/include/configs/mp2usb.h
@@@ -129,36 -123,53 +129,52 @@@
  
  #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

diff --cc include/configs/trab.h
Simple merge

diff --cc include/configs/yosemite.h
Simple merge