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

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

diff --git a/include/configs/CPCI750.h b/include/configs/CPCI750.h
index 3b0b888f7eb44f81a2b67f7f3c28823998d480c7..f2d51f75eeb975ec22ddfa0312ef57eafaf7b240 100644 (file)
--- a/include/configs/CPCI750.h
+++ b/include/configs/CPCI750.h
@@ -59,7 +59,7 @@
 
 #define CONFIG_BAUDRATE                9600    /* console baudrate = 9600      */
 
-#undef CONFIG_ECC                      /* enable ECC support */
+#define CONFIG_MV64360_ECC             /* enable ECC support */
 
 #define CONFIG_HIGH_BATS       1       /* High BATs supported */
 
@@ -234,8 +234,7 @@
 #define CONFIG_SYS_LOAD_ADDR           0x00300000      /* default load address */
 
 #define CONFIG_SYS_HZ                  1000            /* decr freq: 1ms ticks */
-#define CONFIG_SYS_BUS_HZ              133000000       /* 133 MHz (CPU = 5*Bus = 666MHz)               */
-#define CONFIG_SYS_BUS_CLK             CONFIG_SYS_BUS_HZ
+#define CONFIG_SYS_BUS_CLK             133000000       /* 133 MHz (CPU = 5*Bus = 666MHz)               */
 
 #define CONFIG_SYS_BAUDRATE_TABLE      { 9600, 19200, 38400, 57600, 115200, 230400 }
 
@@ -627,4 +626,8 @@
 
 #define CONFIG_SYS_BOARD_ASM_INIT      1
 
+#define CPCI750_SLAVE_TEST     (((in8(0xf0300000) & 0x80) == 0) ? 0 : 1)
+#define CPCI750_ECC_TEST       (((in8(0xf0300000) & 0x02) == 0) ? 1 : 0)
+#define CONFIG_SYS_PLD_VER     0xf0e00000
+
 #endif /* __CONFIG_H */