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

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

diff --git a/include/configs/balloon3.h b/include/configs/balloon3.h
index b604b52..756f409 100644 (file)
--- a/include/configs/balloon3.h
+++ b/include/configs/balloon3.h
@@ -25,7 +25,7 @@
 /*
  * High Level Board Configuration Options
  */
-#define        CONFIG_PXA27X           1       /* Marvell PXA270 CPU */
+#define        CONFIG_CPU_PXA27X               1       /* Marvell PXA270 CPU */
 #define        CONFIG_BALLOON3         1       /* Balloon3 board */
 
 /*
@@ -54,7 +54,6 @@
 #define        CONFIG_PXA_SERIAL
 #define        CONFIG_STUART                   1
 #define        CONFIG_BAUDRATE                 115200
-#define        CONFIG_SYS_BAUDRATE_TABLE       { 9600, 19200, 38400, 57600, 115200 }
 
 /*
  * Bootloader Components Configuration
@@ -81,7 +80,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
@@ -104,15 +102,6 @@
 #define        CONFIG_SYS_CPUSPEED             0x290           /* 520MHz */
 
 /*
- * 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
  */
 #define        CONFIG_NR_DRAM_BANKS            3               /* 2 banks of DRAM */