Merge branch 'next'

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

diff --git a/include/configs/rsk7269.h b/include/configs/rsk7269.h
index 4796039..b4fbc9c 100644 (file)
--- a/include/configs/rsk7269.h
+++ b/include/configs/rsk7269.h
@@ -11,14 +11,9 @@
 #define __RSK7269_H
 
 #undef DEBUG
-#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_BAUDRATE                115200
 #define CONFIG_BOOTARGS                "console=ttySC7,115200"
 #define CONFIG_BOOTDELAY       3
@@ -64,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