Merge branch 'for-wd-master' of git://git.denx.de/u-boot-pxa

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

diff --git a/include/configs/mpr2.h b/include/configs/mpr2.h
index 86f6a934f9f1fb8905704774ee0775accfd6912a..311f524024da7788ade2cb762a07402ef0a3b4dc 100644 (file)
--- a/include/configs/mpr2.h
+++ b/include/configs/mpr2.h
@@ -57,7 +57,6 @@
 #define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_FLASH_BASE
 #define CONFIG_SYS_MONITOR_LEN         (128 * 1024)
 #define CONFIG_SYS_MALLOC_LEN          (256 * 1024)
-#define CONFIG_SYS_GBL_DATA_SIZE       256
 
 /* Memory */
 #define CONFIG_SYS_SDRAM_BASE          0x8C000000
@@ -82,8 +81,8 @@
 
 /* Clocks */
 #define CONFIG_SYS_CLK_FREQ    24000000
-#define TMU_CLK_DIVIDER                4       /* 4 (default), 16, 64, 256 or 1024 */
-#define CONFIG_SYS_HZ                  (CONFIG_SYS_CLK_FREQ / TMU_CLK_DIVIDER)
+#define CONFIG_SYS_TMU_CLK_DIV         4       /* 4 (default), 16, 64, 256 or 1024 */
+#define CONFIG_SYS_HZ          1000
 
 /* UART */
 #define CONFIG_SCIF_CONSOLE    1