X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=sidebyside;f=include%2Fconfigs%2Fcolibri_pxa270.h;h=bb8bea719dcfa97576a2aac6db2e8d6e491d5474;hb=039cbaefcf57338cc9b6a3c656db64e7907838db;hp=cde84ecc864495a77153044eefa1a543aa682726;hpb=f9f5486c743db65e7e6583db39dd72e14d8d0f22;p=u-boot

diff --git a/include/configs/colibri_pxa270.h b/include/configs/colibri_pxa270.h
index cde84ecc86..bb8bea719d 100644
--- 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
  */
@@ -57,8 +55,8 @@
  */
 #define	CONFIG_PXA_SERIAL
 #define	CONFIG_FFUART			1
+#define CONFIG_CONS_INDEX		3
 #define	CONFIG_BAUDRATE			115200
-#define	CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 
 /*
  * Bootloader Components Configuration
@@ -92,32 +90,10 @@
 #define	CONFIG_BOOTP_HOSTNAME
 #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
@@ -141,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
  */
@@ -263,17 +228,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 */