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

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

diff --git a/include/configs/assabet.h b/include/configs/assabet.h
index 024fa20..58cdbd5 100644 (file)
--- a/include/configs/assabet.h
+++ b/include/configs/assabet.h
@@ -37,6 +37,8 @@
 #define CONFIG_ASSABET         1       /* on an Intel Assabet Board    */
 
 #undef CONFIG_USE_IRQ
+/* 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
@@ -51,12 +53,14 @@
 /*
  * Hardware drivers
  */
-#define CONFIG_DRIVER_LAN91C96 /* we have an SMC9194 on-board */
+#define CONFIG_NET_MULTI
+#define CONFIG_LAN91C96        /* we have an SMC9194 on-board */
 #define CONFIG_LAN91C96_BASE   0x18000000
 
 /*
  * select serial console configuration
  */
+#define CONFIG_SA1100_SERIAL
 #define CONFIG_SERIAL1          1      /* we use SERIAL 1 on Intel Assabet */
 
 /* allow to overwrite serial and ethaddr */
@@ -105,8 +109,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
-
 #define CONFIG_SYS_LOAD_ADDR           0xc0000000      /* default load address */
 
 #define CONFIG_SYS_HZ                  3686400 /* incrementer freq: 3.6864 MHz */
@@ -138,7 +140,7 @@
 #define PHYS_FLASH_BANK_SIZE    0x01000000     /* 16 MB Banks */
 #define PHYS_FLASH_SECT_SIZE    0x00040000     /* 256 KB sectors (x2) */
 
-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE
 #define CONFIG_SYS_MONITOR_LEN         (256 * 1024)    /* Reserve 256 KB for Monitor */
 
 #if CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE