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

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

diff --git a/include/configs/innokom.h b/include/configs/innokom.h
index 895998adf4c685cc84b00f5dc4e3e579c7100bfc..9cb0d42eac7b02dfd71ab8a6aec195077710f033 100644 (file)
--- a/include/configs/innokom.h
+++ b/include/configs/innokom.h
@@ -39,6 +39,10 @@
 
 #undef CONFIG_USE_IRQ                  /* we don't need IRQ/FIQ stuff      */
                                        /* for timer/console/ethernet       */
+
+/* we will never enable dcache, because we have to setup MMU first */
+#define CONFIG_SYS_NO_DCACHE
+
 /*
  * Hardware drivers
  */
@@ -46,6 +50,7 @@
 /*
  * select serial console configuration
  */
+#define CONFIG_PXA_SERIAL
 #define CONFIG_FFUART          1       /* we use FFUART on CSB226 */
 
 /* allow to overwrite serial and ethaddr */
@@ -152,7 +157,8 @@
 /*
  * SMSC91C111 Network Card
  */
-#define CONFIG_DRIVER_SMC91111         1
+#define CONFIG_NET_MULTI
+#define CONFIG_SMC91111                1
 #define CONFIG_SMC91111_BASE           0x14000000 /* chip select 5         */
 #undef  CONFIG_SMC_USE_32_BIT                     /* 16 bit bus access     */
 #undef  CONFIG_SMC_91111_EXT_PHY                  /* we use internal phy   */