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

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

diff --git a/include/configs/gcplus.h b/include/configs/gcplus.h
index c0b3ab91e433c74cdb9263419100b9b0bffe5ce8..b2fbca2f3c2d564539592f4021d5019e213588bf 100644 (file)
--- a/include/configs/gcplus.h
+++ b/include/configs/gcplus.h
@@ -49,6 +49,8 @@
 #define CONFIG_GCPLUS          1       /* on an ADS GCPlus Board      */
 
 #undef CONFIG_USE_IRQ                  /* we don't need IRQ/FIQ stuff */
+/* we will never enable dcache, because we have to setup MMU first */
+#define CONFIG_SYS_NO_DCACHE
 
 #define CONFIG_CMDLINE_TAG      1      /* enable passing of ATAGs      */
 #define CONFIG_SETUP_MEMORY_TAGS 1
@@ -70,6 +72,7 @@
 /*
  * select serial console configuration
  */
+#define CONFIG_SA1100_SERIAL
 #define CONFIG_SERIAL3          1      /* we use SERIAL 3 on ADS GCPlus */
 
 /* allow to overwrite serial and ethaddr */
@@ -118,8 +121,6 @@
 #define CONFIG_SYS_MEMTEST_START       0xc0400000      /* memtest works on     */
 #define CONFIG_SYS_MEMTEST_END         0xc0800000      /* 4 ... 8 MB in DRAM   */
 
-#undef  CONFIG_SYS_CLKS_IN_HZ          /* everything, incl board info, in Hz */
-
 #define        CONFIG_SYS_LOAD_ADDR            0xc0000000      /* default load address */
 
 #define        CONFIG_SYS_HZ                   3686400         /* incrementer freq: 3.6864 MHz */