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

[karo-tx-uboot.git] / include / configs / assabet.h

diff --git a/include/configs/assabet.h b/include/configs/assabet.h
index 4da68b3e7045e850f6b9f1876cf6ea260c09e1ca..d17d4bd968bd926cdb05cdc74f756010370eaa77 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 */