Merge branch 'i2c'

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

diff --git a/include/configs/PM856.h b/include/configs/PM856.h
index 5dae1b6b02ca9941b5d52b533ffa449b2e3c48fd..87ab93487354dc11e78c117d992429dd218d027b 100644 (file)
--- a/include/configs/PM856.h
+++ b/include/configs/PM856.h
@@ -39,6 +39,7 @@
 #define CONFIG_E500            1       /* BOOKE e500 family */
 #define CONFIG_MPC85xx         1       /* MPC8540/MPC8560 */
 #define CONFIG_MPC8560         1       /* MPC8560 specific */
+#define CONFIG_CPM2            1       /* Has a CPM2 */
 #define CONFIG_PM856           1       /* PM856 board specific */
 
 #define CONFIG_PCI
@@ -48,6 +49,7 @@
 #define CONFIG_DDR_ECC                 /* only for ECC DDR module */
 #define CONFIG_DDR_DLL                 /* possible DLL fix needed */
 #define CONFIG_DDR_2T_TIMING           /* Sets the 2T timing bit */
+#define CONFIG_MEM_INIT_VALUE          0xDEADBEEF
 
 
 /*
@@ -188,12 +190,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
 
 /*
  * EEPROM configuration
@@ -253,7 +259,9 @@
 
 #define CONFIG_MII             1       /* MII PHY management */
 #define CONFIG_MPC85XX_TSEC1   1
+#define CONFIG_MPC85XX_TSEC1_NAME      "TSEC0"
 #define CONFIG_MPC85XX_TSEC2   1
+#define CONFIG_MPC85XX_TSEC2_NAME      "TSEC1"
 #undef CONFIG_MPC85XX_FEC
 #define TSEC1_PHY_ADDR         0
 #define TSEC2_PHY_ADDR         1
@@ -262,7 +270,7 @@
 
 #endif  /* CONFIG_TSEC_ENET */
 
-#define CONFIG_ETHPRIME                "ENET0"
+#define CONFIG_ETHPRIME                "TSEC0"
 
 #define CONFIG_ETHER_ON_FCC    /* define if ether on FCC   */
 #undef  CONFIG_ETHER_NONE      /* define if ether on something else */