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

[oweals/u-boot.git] / include / configs / xsengine.h

diff --git a/include/configs/xsengine.h b/include/configs/xsengine.h
index 5d13f9682e71b0498b05890cefdeec14513b4ffd..f68461bb227e140bf18a6372ce5f31971a998927 100644 (file)
--- a/include/configs/xsengine.h
+++ b/include/configs/xsengine.h
@@ -35,6 +35,9 @@
 #define CONFIG_DOS_PARTITION           1
 #define BOARD_LATE_INIT                        1
 #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_SYS_HZ                  1000
 #define CONFIG_SYS_CPUSPEED                    0x161           /* set core clock to 400/200/100 MHz */
 
@@ -91,11 +94,13 @@
 #define CONFIG_SYS_GBL_DATA_SIZE               128             /* size in bytes reserved for initial data */
 
 /* Hardware drivers */
-#define CONFIG_DRIVER_SMC91111
+#define CONFIG_NET_MULTI
+#define CONFIG_SMC91111
 #define CONFIG_SMC91111_BASE           0x04000300
 #define CONFIG_SMC_USE_32_BIT          1
 
 /* select serial console configuration */
+#define CONFIG_PXA_SERIAL
 #define CONFIG_FFUART                  1
 
 /* allow to overwrite serial and ethaddr */
@@ -139,7 +144,6 @@
 #define CONFIG_SYS_BARGSIZE                    CONFIG_SYS_CBSIZE                               /* Boot Argument Buffer Size */
 #define CONFIG_SYS_MEMTEST_START               0xA0400000                              /* memtest works on     */
 #define CONFIG_SYS_MEMTEST_END                 0xA0800000                              /* 4 ... 8 MB in DRAM   */
-#undef  CONFIG_SYS_CLKS_IN_HZ                                                          /* everything, incl board info, in Hz */
 #define CONFIG_SYS_BAUDRATE_TABLE              { 9600, 19200, 38400, 57600, 115200 }   /* valid baudrates */
 #define CONFIG_SYS_LOAD_ADDR                   0xA0000000                              /* load kernel to this address   */