commit af7ae1a411c67ee9d17a66d17ce50b374f3dd4e7
author Michal Simek <monstr@monstr.eu> Fri Mar 28 12:13:03 2008 +0100
committer Michal Simek <monstr@monstr.eu> Tue Apr 08 15:38:14 2008 +0200
tree 56866a37220e01a2fc5b2e3f6c019b01b3c78991
parent 0b20f250877441460fb79d72192954abe8498834

microblaze: clean uart16550 and uartlite handling

Signed-off-by: Michal Simek <monstr@monstr.eu>

include/configs/xupv2p.h

diff --git a/include/configs/xupv2p.h b/include/configs/xupv2p.h
index eef4f72..f86b3b9 100644
--- a/include/configs/xupv2p.h
+++ b/include/configs/xupv2p.h
@@ -31,10 +31,23 @@
 #define	CONFIG_XUPV2P		1
 
 /* uart */
+#ifdef XILINX_UARTLITE_BASEADDR
 #define	CONFIG_XILINX_UARTLITE
-#define	CONFIG_SERIAL_BASE	XILINX_UART_BASEADDR
-#define	CONFIG_BAUDRATE		XILINX_UART_BAUDRATE
+#define	CONFIG_SERIAL_BASE	XILINX_UARTLITE_BASEADDR
+#define	CONFIG_BAUDRATE		XILINX_UARTLITE_BAUDRATE
 #define	CFG_BAUDRATE_TABLE	{ CONFIG_BAUDRATE }
+#else
+#ifdef XILINX_UART16550_BASEADDR
+#define CFG_NS16550
+#define CFG_NS16550_SERIAL
+#define CFG_NS16550_REG_SIZE	4
+#define CONFIG_CONS_INDEX	1
+#define CFG_NS16550_COM1	XILINX_UART16550_BASEADDR
+#define CFG_NS16550_CLK		XILINX_UART16550_CLOCK_HZ
+#define	CONFIG_BAUDRATE		115200
+#define	CFG_BAUDRATE_TABLE	{ 9600, 115200 }
+#endif
+#endif
 
 /*
  * setting reset address