From: Wolfgang Denk <wd@denx.de>
Date: Thu, 9 Aug 2007 20:38:39 +0000 (+0200)
Subject: Merge with /home/wd/git/u-boot/custodian/u-boot-mpc83xx
X-Git-Tag: v1.3.0-rc1~19^2~20^2~13
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=2c4faea84f3d96d674e3c065e1f220b20c8930c0;p=oweals%2Fu-boot.git

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

2c4faea84f3d96d674e3c065e1f220b20c8930c0
diff --cc include/configs/MPC8349ITX.h
index 121ff06dc5,72abd8ebf7..44649d0509
--- a/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 */
  
  /*