Merge with /home/stefan/git/u-boot/acadia

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

diff --git a/include/configs/SBC8540.h b/include/configs/SBC8540.h
index 5bdabfe..f8e3397 100644 (file)
--- a/include/configs/SBC8540.h
+++ b/include/configs/SBC8540.h
@@ -214,12 +214,16 @@
 #define CFG_PROMPT_HUSH_PS2 "> "
 #endif
 
-/* I2C */
-#define         CONFIG_HARD_I2C                /* I2C with hardware support*/
+/*
+ * I2C
+ */
+#define CONFIG_FSL_I2C         /* Use FSL common I2C driver */
+#define CONFIG_HARD_I2C                /* I2C with hardware support*/
 #undef CONFIG_SOFT_I2C                 /* I2C bit-banged */
 #define CFG_I2C_SPEED          400000  /* I2C speed and slave address  */
 #define CFG_I2C_SLAVE          0x7F
 #define CFG_I2C_NOPROBES       {0x69}  /* Don't probe these addrs */
+#define CFG_I2C_OFFSET         0x3000
 
 #define CFG_PCI_MEM_BASE       0xC0000000
 #define CFG_PCI_MEM_PHYS       0xC0000000
@@ -227,10 +231,14 @@
 
 #if defined(CONFIG_TSEC_ENET)          /* TSEC Ethernet port */
 
-  #define CONFIG_NET_MULTI     1
-  #define CONFIG_PHY_BCM5421S          /* GigaBit Ether PHY         */
-  #define CONFIG_MII           1       /* MII PHY management           */
-  #define CONFIG_PHY_ADDR      25      /* PHY address                  */
+#  define CONFIG_NET_MULTI     1
+#  define CONFIG_MPC85xx_TSEC1
+#  define CONFIG_MPC85xx_TSEC1_NAME    "TSEC0"
+#  define CONFIG_MII           1       /* MII PHY management           */
+#  define TSEC1_PHY_ADDR       25
+#  define TSEC1_PHYIDX         0
+/* Options are: TSEC0 */
+#  define CONFIG_ETHPRIME              "TSEC0"
 
 
 #elif defined(CONFIG_ETHER_ON_FCC)     /* CPM FCC Ethernet */