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

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

diff --git a/include/configs/zipitz2.h b/include/configs/zipitz2.h
index 8b7e05b9e51fe7597ec7f1ce9af891d0f1f6b538..b92f70b538d72552572e038e697206ad6b7d9858 100644 (file)
--- a/include/configs/zipitz2.h
+++ b/include/configs/zipitz2.h
@@ -41,6 +41,9 @@
 #define CONFIG_ENV_ADDR                        0x40000
 #define CONFIG_ENV_SIZE                        0x20000
 
+/* we will never enable dcache, because we have to setup MMU first */
+#define CONFIG_SYS_DCACHE_OFF
+
 #define        CONFIG_SYS_MALLOC_LEN           (128*1024)
 #define        CONFIG_ARCH_CPU_INIT
 
@@ -66,6 +69,7 @@
  */
 #define        CONFIG_PXA_SERIAL
 #define        CONFIG_STUART                   1
+#define CONFIG_CONS_INDEX              2
 #define        CONFIG_BAUDRATE                 115200
 
 /*