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

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

diff --git a/include/configs/KAREF.h b/include/configs/KAREF.h
index 403081d0d2b981b4e62fa2e69099775f3fc61920..49a7378f272720e625e2ac10bbf5a9e6f825f00f 100644 (file)
--- a/include/configs/KAREF.h
+++ b/include/configs/KAREF.h
@@ -132,6 +132,7 @@
  *----------------------------------------------------------------------*/
 #define CONFIG_HARD_I2C              1              /* I2C hardware support    */
 #undef CONFIG_SOFT_I2C                      /* I2C !bit-banged         */
+#define CONFIG_PPC4XX_I2C              /* use PPC4xx driver            */
 #define CONFIG_SYS_I2C_SPEED         400000         /* I2C speed 400kHz        */
 #define CONFIG_SYS_I2C_SLAVE         0x7F           /* I2C slave address       */
 #define CONFIG_SYS_I2C_NOPROBES      {0x69}         /* Don't probe these addrs */
@@ -157,6 +158,7 @@
 /*-----------------------------------------------------------------------
  * Networking
  *----------------------------------------------------------------------*/
+#define CONFIG_PPC4xx_EMAC
 #define CONFIG_MII           1              /* MII PHY management      */
 #define CONFIG_NET_MULTI      1
 #define CONFIG_PHY_ADDR              0xff           /* no phy on EMAC0         */