Merge branch 'next' of ../custodians into next

[u-boot] / include / configs / CPCI405.h

diff --git a/include/configs/CPCI405.h b/include/configs/CPCI405.h
index fca6de0c6bce2fb704a06f42abbaea706301c638..3e7020df89dc06b4f6ddd4bcbadad8a8f68cc1f2 100644 (file)
--- a/include/configs/CPCI405.h
+++ b/include/configs/CPCI405.h
@@ -38,6 +38,7 @@
 #define CONFIG_CPCI405         1       /* ...on a CPCI405 board        */
 
 #define CONFIG_BOARD_EARLY_INIT_F 1    /* call board_early_init_f()    */
+#define CONFIG_MISC_INIT_R      1      /* call misc_init_r()           */
 
 #define CONFIG_SYS_CLK_FREQ    33000000 /* external frequency to pll   */
 
@@ -255,6 +256,7 @@
  * I2C EEPROM (CAT24WC08) 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