hush.c: Move default CONFIG_SYS_PROMPT_HUSH_PS2 to hush.c

[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 cde84ec..1f02f3f 100644 (file)
--- a/include/configs/colibri_pxa270.h
+++ b/include/configs/colibri_pxa270.h
@@ -28,8 +28,6 @@
 #define        CONFIG_CPU_PXA27X               1       /* Marvell PXA270 CPU */
 #define        CONFIG_SYS_TEXT_BASE            0x0
 
-#define        CONFIG_DISPLAY_CPUINFO
-
 /*
  * Environment settings
  */
@@ -58,7 +56,6 @@
 #define        CONFIG_PXA_SERIAL
 #define        CONFIG_FFUART                   1
 #define        CONFIG_BAUDRATE                 115200
-#define        CONFIG_SYS_BAUDRATE_TABLE       { 9600, 19200, 38400, 57600, 115200 }
 
 /*
  * Bootloader Components Configuration
@@ -93,31 +90,9 @@
 #endif
 
 /*
- * MMC Card Configuration
- */
-#ifdef CONFIG_CMD_MMC
-#define        CONFIG_MMC
-#define        CONFIG_GENERIC_MMC
-#define        CONFIG_PXA_MMC_GENERIC
-#define        CONFIG_SYS_MMC_BASE             0xF0000000
-#define        CONFIG_CMD_FAT
-#define        CONFIG_CMD_EXT2
-#define        CONFIG_DOS_PARTITION
-#endif
-
-/*
- * KGDB
- */
-#ifdef CONFIG_CMD_KGDB
-#define        CONFIG_KGDB_BAUDRATE            230400          /* speed to run kgdb serial port */
-#define        CONFIG_KGDB_SER_INDEX           2               /* which serial port to use */
-#endif
-
-/*
  * HUSH Shell Configuration
  */
 #define        CONFIG_SYS_HUSH_PARSER          1
-#define        CONFIG_SYS_PROMPT_HUSH_PS2      "> "
 
 #define        CONFIG_SYS_LONGHELP
 #ifdef CONFIG_SYS_HUSH_PARSER
@@ -263,17 +238,6 @@
 #define        CONFIG_SYS_MCIO0_VAL    0x0001430f
 #define        CONFIG_SYS_MCIO1_VAL    0x0001430f
 
-/*
- * USB
- */
-#ifdef CONFIG_CMD_USB
-#define        CONFIG_USB_OHCI_NEW
-#define        CONFIG_SYS_USB_OHCI_CPU_INIT
-#define        CONFIG_SYS_USB_OHCI_BOARD_INIT
-#define        CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS      2
-#define        CONFIG_SYS_USB_OHCI_REGS_BASE   0x4C000000
-#define        CONFIG_SYS_USB_OHCI_SLOT_NAME   "tdex270"
-#define        CONFIG_USB_STORAGE
-#endif
+#include "pxa-common.h"
 
 #endif /* __CONFIG_H */