Merge with /home/wd/git/u-boot/custodian/u-boot-mpc83xx

diff --cc include/configs/MPC8349ITX.h
index 121ff06dc5cecb4c7a474ffe11b2fc32dbdf96eb,72abd8ebf7f7ad851e548c383a9b0fecf98ddf39..44649d05090b9a2cfeb7b84c6cdc699c26625334
--- 1/include/configs/MPC8349ITX.h
--- 2/include/configs/MPC8349ITX.h
+++ b/include/configs/MPC8349ITX.h
@@@ -447,12 -433,32 +449,10 @@@ boards, we say we have two, but don't d
  #endif
  
  #ifdef CONFIG_HARD_I2C
 -#define CONFIG_COMMANDS_I2C   CFG_CMD_I2C
 -#else
 -#define CONFIG_COMMANDS_I2C   0
 +    #define CONFIG_CMD_I2C
  #endif
  
 -#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    | \
 -                              CONFIG_COMMANDS_I2C     | \
 -                              CONFIG_COMMANDS_PCI     | \
 -                              CFG_CMD_SDRAM   | \
 -                              CFG_CMD_DATE    | \
 -                              CFG_CMD_CACHE   | \
 -                              CFG_CMD_IRQ)
 -#include <cmd_confdefs.h>
--
  /* Watchdog */
--
  #undef CONFIG_WATCHDOG                /* watchdog disabled */
  
  /*