Merge remote-tracking branch 'u-boot/master'

[platform/kernel/u-boot.git] / include / configs / colibri_pxa270.h

diff --git a/include/configs/colibri_pxa270.h b/include/configs/colibri_pxa270.h
index 4a3b01d..ae84344 100644 (file)
--- a/include/configs/colibri_pxa270.h
+++ b/include/configs/colibri_pxa270.h
@@ -93,7 +93,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
@@ -118,17 +117,6 @@
 #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
  */
 #define        CONFIG_NR_DRAM_BANKS            1               /* We have 1 bank of DRAM */