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

[u-boot] / include / configs / colibri_pxa270.h

diff --git a/include/configs/colibri_pxa270.h b/include/configs/colibri_pxa270.h
index 4a3b01d0c55126689bffd607d53e6160ae020a4e..bb8bea719dcfa97576a2aac6db2e8d6e491d5474 100644 (file)
--- a/include/configs/colibri_pxa270.h
+++ b/include/configs/colibri_pxa270.h
@@ -55,6 +55,7 @@
  */
 #define        CONFIG_PXA_SERIAL
 #define        CONFIG_FFUART                   1
+#define CONFIG_CONS_INDEX              3
 #define        CONFIG_BAUDRATE                 115200
 
 /*
@@ -93,7 +94,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
@@ -117,17 +117,6 @@
 #define        CONFIG_SYS_HZ                   1000            /* Timer @ 3250000 Hz */
 #define        CONFIG_SYS_CPUSPEED             0x290           /* 520MHz */
 
-/*
- * Stack sizes
- *
- * The stack sizes are set up in start.S using the settings below
- */
-#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
  */