Merge branch 'master' of git://git.denx.de/u-boot-arm

[platform/kernel/u-boot.git] / include / configs / PLU405.h

diff --git a/include/configs/PLU405.h b/include/configs/PLU405.h
index 955e0a8..f917eb5 100644 (file)
--- a/include/configs/PLU405.h
+++ b/include/configs/PLU405.h
@@ -99,8 +99,6 @@
 
 #define CONFIG_SUPPORT_VFAT
 
-#define CONFIG_AUTO_UPDATE      1       /* autoupdate via compactflash  */
-
 #undef CONFIG_WATCHDOG                 /* watchdog disabled            */
 
 #define CONFIG_RTC_MC146818            /* DS1685 is MC146818 compatible*/
@@ -183,8 +181,6 @@
 #define CONFIG_SYS_NAND_SKIP_BAD_DOT_I 1       /* ".i" read skips bad blocks   */
 #define CONFIG_SYS_NAND_QUIET          1
 
-#define CONFIG_SYS_64BIT_VSPRINTF      /* needed for nand_util.c */
-
 /*
  * PCI stuff
  */
@@ -282,6 +278,7 @@
  * I2C EEPROM (24WC16) for environment
  */
 #define CONFIG_HARD_I2C                        /* I2c with hardware support */
+#define CONFIG_PPC4XX_I2C              /* use PPC4xx driver            */
 #define CONFIG_SYS_I2C_SPEED           400000  /* I2C speed and slave address */
 #define CONFIG_SYS_I2C_SLAVE           0x7F
 
@@ -300,7 +297,8 @@
 /*
  * External Bus Controller (EBC) Setup
  */
-#define CAN_BA         0xF0000000          /* CAN Base Address         */
+#define CAN0_BA                0xF0000000          /* CAN0 Base Address        */
+#define CAN1_BA                0xF0000100          /* CAN1 Base Address        */
 #define DUART0_BA      0xF0000400          /* DUART Base Address       */
 #define DUART1_BA      0xF0000408          /* DUART Base Address       */
 #define RTC_BA         0xF0000500          /* RTC Base Address         */