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

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

diff --git a/include/configs/PM854.h b/include/configs/PM854.h
index 1cc80ad214612d371e6028835cac58fd0dcdbb4b..7426bcadfdd624a18f2d97b18164cc3af03dbdaa 100644 (file)
--- a/include/configs/PM854.h
+++ b/include/configs/PM854.h
@@ -71,7 +71,6 @@
  */
 #define CONFIG_L2_CACHE                        /* toggle L2 cache */
 #define CONFIG_BTB                     /* toggle branch predition */
-#define CONFIG_ADDR_STREAMING          /* toggle addr streaming */
 
 #define CONFIG_BOARD_EARLY_INIT_F      1       /* Call board_pre_init */
 
@@ -97,6 +96,7 @@
 #undef CONFIG_DDR_SPD
 #define CONFIG_DDR_DLL                      /* possible DLL fix needed */
 #define CONFIG_DDR_ECC                     /* only for ECC DDR module */
+#define CONFIG_FSL_DMA                     /* use DMA to init DDR ECC  */
 
 #define CONFIG_MEM_INIT_VALUE  0xDeadBeef
 
@@ -326,13 +326,14 @@
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_EEPROM
+#define CONFIG_CMD_REGINFO
 
 #if defined(CONFIG_PCI)
     #define CONFIG_CMD_PCI
 #endif
 
 #if defined(CONFIG_SYS_RAMBOOT)
-    #undef CONFIG_CMD_ENV
+    #undef CONFIG_CMD_SAVEENV
     #undef CONFIG_CMD_LOADS
 #endif