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

diff --combined include/configs/MPC8349ITX.h
index 0ff6580,834934d..72abd8e
--- 1/include/configs/MPC8349ITX.h
--- 2/include/configs/MPC8349ITX.h
+++ b/include/configs/MPC8349ITX.h
@@@ -289,7 -289,6 +289,7 @@@ boards, we say we have two, but don't d
  #define CFG_BAUDRATE_TABLE  \
        {300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 115200}
  
 +#define CONFIG_CONSOLE                ttyS0
  #define CONFIG_BAUDRATE               115200
  
  #define CFG_NS16550_COM1      (CFG_IMMR + 0x4500)
@@@ -375,18 -374,18 +375,18 @@@
  #define CONFIG_MII
  #define CONFIG_PHY_GIGE               /* In case CFG_CMD_MII is specified */
  
- #define CONFIG_MPC83XX_TSEC1
+ #define CONFIG_TSEC1
  
- #ifdef CONFIG_MPC83XX_TSEC1
- #define CONFIG_MPC83XX_TSEC1_NAME  "TSEC0"
+ #ifdef CONFIG_TSEC1
+ #define CONFIG_TSEC1_NAME  "TSEC0"
  #define CFG_TSEC1_OFFSET      0x24000
  #define TSEC1_PHY_ADDR                0x1c    /* VSC8201 uses address 0x1c */
  #define TSEC1_PHYIDX          0
  #endif
  
- #ifdef CONFIG_MPC83XX_TSEC2
+ #ifdef CONFIG_TSEC2
  #define CONFIG_HAS_ETH1
- #define CONFIG_MPC83XX_TSEC2_NAME  "TSEC1"
+ #define CONFIG_TSEC2_NAME  "TSEC1"
  #define CFG_TSEC2_OFFSET      0x25000
  #define CONFIG_UNKNOWN_TSEC   /* TSEC2 is proprietary */
  #define TSEC2_PHY_ADDR                4
@@@ -409,7 -408,6 +409,7 @@@
    #define CFG_ENV_SIZE                0x2000
  #else
    #define CFG_NO_FLASH                /* Flash is not usable now */
 +  #undef  CFG_FLASH_CFI_DRIVER
    #define CFG_ENV_IS_NOWHERE  /* Store ENV in memory only */
    #define CFG_ENV_ADDR                (CFG_MONITOR_BASE - 0x1000)
    #define CFG_ENV_SIZE                0x2000
@@@ -438,14 -436,7 +438,14 @@@
  #define CONFIG_COMMANDS_I2C   0
  #endif
  
 -#define CONFIG_COMMANDS               (CONFIG_CMD_DFL | \
 +#ifdef CFG_NO_FLASH
 +#define CONFIG_COMMANDS_DEFAULT (CONFIG_CMD_DFL & ~(CFG_CMD_FLASH | \
 +                                                  CFG_CMD_IMLS))
 +#else
 +#define CONFIG_COMMANDS_DEFAULT CONFIG_CMD_DFL
 +#endif
 +
 +#define CONFIG_COMMANDS               (CONFIG_COMMANDS_DEFAULT | \
                                CONFIG_COMMANDS_CF      | \
                                CFG_CMD_NET     | \
                                CFG_CMD_PING    | \
@@@ -637,11 -628,11 +637,11 @@@
   */
  #define CONFIG_ENV_OVERWRITE
  
- #ifdef CONFIG_MPC83XX_TSEC1
+ #ifdef CONFIG_TSEC1
  #define CONFIG_ETHADDR                00:E0:0C:00:8C:01
  #endif
  
- #ifdef CONFIG_MPC83XX_TSEC2
+ #ifdef CONFIG_TSEC2
  #define CONFIG_ETH1ADDR               00:E0:0C:00:8C:02
  #endif
  
@@@ -679,10 -670,9 +679,10 @@@
        " ip=" MK_STR(CONFIG_IPADDR) ":" MK_STR(CONFIG_SERVERIP) ":"    \
                MK_STR(CONFIG_GATEWAYIP) ":" MK_STR(CONFIG_NETMASK) ":" \
                MK_STR(CONFIG_HOSTNAME) ":" MK_STR(CONFIG_NETDEV) ":off" \
 -      " console=ttyS0," MK_STR(CONFIG_BAUDRATE)
 +      " console=" MK_STR(CONFIG_CONSOLE) "," MK_STR(CONFIG_BAUDRATE)
  
  #define CONFIG_EXTRA_ENV_SETTINGS \
 +      "console=" MK_STR(CONFIG_CONSOLE) "\0"                          \
        "netdev=" MK_STR(CONFIG_NETDEV) "\0"                            \
        "uboot=" MK_STR(CONFIG_UBOOTPATH) "\0"                          \
        "tftpflash=tftpboot $loadaddr $uboot; "                         \