Merge git://git.denx.de/u-boot-nand-flash

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

diff --git a/include/configs/sh7785lcr.h b/include/configs/sh7785lcr.h
index 04f1d2284e751daf5b6279584c5d35d768fe7f5e..794c48c49a24756ecde518dc1d8eccee553e97f7 100644 (file)
--- a/include/configs/sh7785lcr.h
+++ b/include/configs/sh7785lcr.h
@@ -10,31 +10,18 @@
 #define __SH7785LCR_H
 
 #undef DEBUG
-#define CONFIG_SH              1
-#define CONFIG_SH4A            1
 #define CONFIG_CPU_SH7785      1
 #define CONFIG_SH7785LCR       1
 
-#define CONFIG_CMD_FLASH
-#define CONFIG_CMD_MEMORY
 #define CONFIG_CMD_PCI
-#define CONFIG_CMD_NET
-#define CONFIG_CMD_PING
-#define CONFIG_CMD_NFS
 #define CONFIG_CMD_SDRAM
-#define CONFIG_CMD_RUN
-#define CONFIG_CMD_SAVEENV
 #define CONFIG_CMD_SH_ZIMAGEBOOT
 
-#define CONFIG_CMD_USB
 #define CONFIG_USB_STORAGE
-#define CONFIG_CMD_EXT2
-#define CONFIG_CMD_FAT
 #define CONFIG_DOS_PARTITION
 #define CONFIG_MAC_PARTITION
 
 #define CONFIG_BAUDRATE                115200
-#define CONFIG_BOOTDELAY       3
 #define CONFIG_BOOTARGS                "console=ttySC1,115200 root=/dev/nfs ip=dhcp"
 
 #define CONFIG_EXTRA_ENV_SETTINGS                                      \
@@ -65,7 +52,6 @@
 #endif
 
 #define CONFIG_SYS_LONGHELP
-#define CONFIG_SYS_PROMPT              "=> "
 #define CONFIG_SYS_CBSIZE              256
 #define CONFIG_SYS_PBSIZE              256
 #define CONFIG_SYS_MAXARGS             16
@@ -80,7 +66,6 @@
 #undef CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
 #undef CONFIG_SYS_CONSOLE_ENV_OVERWRITE
 
-
 #define CONFIG_SYS_MEMTEST_START       (SH7785LCR_SDRAM_BASE)
 #define CONFIG_SYS_MEMTEST_END         (CONFIG_SYS_MEMTEST_START + \
                                        (SH7785LCR_SDRAM_SIZE) - \
@@ -157,9 +142,6 @@
 #define CONFIG_PCI_SYS_BUS     CONFIG_SYS_SDRAM_BASE
 #define CONFIG_PCI_SYS_SIZE    CONFIG_SYS_SDRAM_SIZE
 
-/* Network device (RTL8169) support */
-#define CONFIG_RTL8169
-
 /* ENV setting */
 #define CONFIG_ENV_IS_IN_FLASH
 #define CONFIG_ENV_OVERWRITE   1
@@ -172,7 +154,8 @@
 /* Board Clock */
 /* The SCIF used external clock. system clock only used timer. */
 #define CONFIG_SYS_CLK_FREQ    50000000
+#define CONFIG_SH_TMU_CLK_FREQ CONFIG_SYS_CLK_FREQ
+#define CONFIG_SH_SCIF_CLK_FREQ CONFIG_SYS_CLK_FREQ
 #define CONFIG_SYS_TMU_CLK_DIV         4
-#define CONFIG_SYS_HZ          1000
 
 #endif /* __SH7785LCR_H */