Merge branch 'master' of git://git.denx.de/u-boot-i2c

[platform/kernel/u-boot.git] / include / configs / rsk7264.h

diff --git a/include/configs/rsk7264.h b/include/configs/rsk7264.h
index 62b0618..cc70909 100644 (file)
--- a/include/configs/rsk7264.h
+++ b/include/configs/rsk7264.h
@@ -11,19 +11,12 @@
 #ifndef __RSK7264_H
 #define __RSK7264_H
 
-#undef DEBUG
-#define CONFIG_SH2             1
-#define CONFIG_SH2A            1
 #define CONFIG_CPU_SH7264      1
 #define CONFIG_RSK7264         1
 
-#ifndef _CONFIG_CMD_DEFAULT_H
-# include <config_cmd_default.h>
-#endif
+#define CONFIG_DISPLAY_BOARDINFO
 
-#define CONFIG_BAUDRATE                115200
 #define CONFIG_BOOTARGS                "console=ttySC3,115200"
-#define CONFIG_BOOTDELAY       3
 #define CONFIG_SYS_BAUDRATE_TABLE      { CONFIG_BAUDRATE }
 
 #define CONFIG_SYS_LONGHELP    1       /* undef to save memory */
@@ -66,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