Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx

[karo-tx-uboot.git] / include / mpc512x.h

diff --git a/include/mpc512x.h b/include/mpc512x.h
index a76b1ca2143f06d2f94687bea2c9e2d97a1d331f..05a206358b04a2b5af0fff8d72dadfdfbea72429 100644 (file)
--- a/include/mpc512x.h
+++ b/include/mpc512x.h
@@ -58,6 +58,7 @@
 #define CS5_CONFIG             0x00014
 #define CS6_CONFIG             0x00018
 #define CS7_CONFIG             0x0001C
+#define CS_ALE_TIMING_CONFIG   0x00034
 
 #define CS_CTRL                        0x00020
 #define CS_CTRL_ME             0x01000000      /* CS Master Enable bit */
@@ -571,7 +572,7 @@ void iopin_initialize(iopin_t *,int);
 #define IOCTRL_MUX_DDR         0x00000036
 
  /* Register Offset Base */
-#define MPC512X_FEC            (CFG_IMMR + 0x02800)
+#define MPC512X_FEC            (CONFIG_SYS_IMMR + 0x02800)
 
 /* Number of I2C buses */
 #define I2C_BUS_CNT    3