Merge git://www.denx.de/git/u-boot-marvell

[people/ms/u-boot.git] / include / configs / rsk7269.h

diff --git a/include/configs/rsk7269.h b/include/configs/rsk7269.h
index 1f4e2f3cc6d90466959da692dd3571b56ba0929c..f470954518202c5e6095b2d62355770dee960c42 100644 (file)
--- a/include/configs/rsk7269.h
+++ b/include/configs/rsk7269.h
@@ -10,24 +10,16 @@
 #ifndef __RSK7269_H
 #define __RSK7269_H
 
-#undef DEBUG
-#define CONFIG_SH              1
-#define CONFIG_SH2             1
-#define CONFIG_SH2A            1
 #define CONFIG_CPU_SH7269      1
 #define CONFIG_RSK7269         1
 
-#ifndef _CONFIG_CMD_DEFAULT_H
-# include <config_cmd_default.h>
-#endif
+#define CONFIG_DISPLAY_BOARDINFO
 
 #define CONFIG_BAUDRATE                115200
 #define CONFIG_BOOTARGS                "console=ttySC7,115200"
-#define CONFIG_BOOTDELAY       3
 #define CONFIG_SYS_BAUDRATE_TABLE      { CONFIG_BAUDRATE }
 
 #define CONFIG_SYS_LONGHELP            /* undef to save memory */
-#define CONFIG_SYS_PROMPT      "=> "   /* Monitor Command Prompt */
 #define CONFIG_SYS_CBSIZE      256     /* Boot Argument Buffer Size */
 #define CONFIG_SYS_PBSIZE      256     /* Print Buffer Size */
 #define CONFIG_SYS_MAXARGS     16      /* max number of command args */
@@ -67,7 +59,7 @@
 #define CONFIG_SH_TMU_CLK_FREQ CONFIG_SYS_CLK_FREQ
 #define CONFIG_SH_SCIF_CLK_FREQ CONFIG_SYS_CLK_FREQ
 #define CMT_CLK_DIVIDER                32      /* 8 (default), 32, 128 or 512 */
-#define CONFIG_SYS_HZ          (CONFIG_SYS_CLK_FREQ / CMT_CLK_DIVIDER)
+#define CONFIG_SH_CMT_CLK_FREQ (CONFIG_SYS_CLK_FREQ / CMT_CLK_DIVIDER)
 
 /* Network interface */
 #define CONFIG_SMC911X