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

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

diff --git a/include/configs/mpc5121ads.h b/include/configs/mpc5121ads.h
index ebc518c03c16efa279906fe43e68de91f0c19d97..5281042efd10aeae32a6b5e4ec4b22dcdde4e361 100644 (file)
--- a/include/configs/mpc5121ads.h
+++ b/include/configs/mpc5121ads.h
@@ -85,6 +85,9 @@
 #endif
 #define CONFIG_SYS_DDR_BASE            0x00000000      /* DDR is system memory*/
 #define CONFIG_SYS_SDRAM_BASE          CONFIG_SYS_DDR_BASE
+#define CONFIG_SYS_MAX_RAM_SIZE                0x20000000
+
+#define CONFIG_SYS_IOCTRL_MUX_DDR      0x00000036
 
 /* DDR Controller Configuration
  *
@@ -239,8 +242,6 @@
 #define NAND_MAX_CHIPS                  CONFIG_SYS_MAX_NAND_DEVICE
 #define CONFIG_SYS_NAND_SELECT_DEVICE  /* driver supports mutipl. chips */
 
-#define        CONFIG_SYS_64BIT_VSPRINTF       /* needed for nand_util.c */
-
 /*
  * Configuration parameters for MPC5121 NAND driver
  */