Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'

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

diff --git a/include/configs/palmld.h b/include/configs/palmld.h
index 514bcaa58eaed70af5fc19617730b46ea270f176..4ee2e46cd22eb520492150aeff040e6556154445 100644 (file)
--- a/include/configs/palmld.h
+++ b/include/configs/palmld.h
@@ -25,9 +25,12 @@
 /*
  * High Level Board Configuration Options
  */
-#define        CONFIG_PXA27X           1       /* Marvell PXA270 CPU */
+#define        CONFIG_CPU_PXA27X               1       /* Marvell PXA270 CPU */
 #define        CONFIG_PALMLD           1       /* Palm LifeDrive board */
 
+/* we will never enable dcache, because we have to setup MMU first */
+#define CONFIG_SYS_DCACHE_OFF
+
 /*
  * Environment settings
  */
@@ -54,8 +57,8 @@
  */
 #define        CONFIG_PXA_SERIAL
 #define        CONFIG_FFUART                   1
+#define CONFIG_CONS_INDEX              3
 #define        CONFIG_BAUDRATE                 9600
-#define        CONFIG_SYS_BAUDRATE_TABLE       { 9600, 19200, 38400, 57600, 115200 }
 
 /*
  * Bootloader Components Configuration
@@ -69,6 +72,7 @@
 #define        CONFIG_CMD_MMC
 #define        CONFIG_CMD_IDE
 #define        CONFIG_LCD
+#define        CONFIG_PXA_LCD
 
 /*
  * MMC Card Configuration
@@ -109,7 +113,6 @@
  * HUSH Shell Configuration
  */
 #define        CONFIG_SYS_HUSH_PARSER          1
-#define        CONFIG_SYS_PROMPT_HUSH_PS2      "> "
 
 #define        CONFIG_SYS_LONGHELP
 #ifdef CONFIG_SYS_HUSH_PARSER
@@ -131,15 +134,6 @@
 #define        CONFIG_SYS_HZ                   3250000         /* Timer @ 3250000 Hz */
 #define        CONFIG_SYS_CPUSPEED             0x210           /* 416MHz ; N=2,L=16 */
 
-/*
- * Stack sizes
- */
-#define        CONFIG_STACKSIZE                (128*1024)      /* regular stack */
-#ifdef CONFIG_USE_IRQ
-#define        CONFIG_STACKSIZE_IRQ            (4*1024)        /* IRQ stack */
-#define        CONFIG_STACKSIZE_FIQ            (4*1024)        /* FIQ stack */
-#endif
-
 /*
  * DRAM Map
  */