Merge branch 'master' of /home/wd/git/u-boot/master

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

diff --git a/include/configs/JSE.h b/include/configs/JSE.h
index 8aca1f941db11f105e06ce4e446ee34d0a4390b3..98f5661a09d285e773fe170b1bebe75b60ce2339 100644 (file)
--- a/include/configs/JSE.h
+++ b/include/configs/JSE.h
@@ -135,6 +135,7 @@
 #define CONFIG_PPC4xx_EMAC
 #define CONFIG_MII             1       /* MII PHY management           */
 #define CONFIG_PHY_ADDR                1       /* PHY address                  */
+#define CONFIG_NET_MULTI
 
 
 /*
@@ -216,6 +217,7 @@
 
 #define CONFIG_HARD_I2C                1       /* I2C with hardware support    */
 #undef CONFIG_SOFT_I2C                 /* I2C bit-banged               */
+#define CONFIG_PPC4XX_I2C              /* use PPC4xx driver            */
 #define CONFIG_SYS_I2C_SPEED           400000  /* I2C speed and slave address  */
 #define CONFIG_SYS_I2C_SLAVE           0x7F