microblaze: clean uart16550 and uartlite handling

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

diff --git a/board/xilinx/ml401/xparameters.h b/board/xilinx/ml401/xparameters.h
index becafc8..d805061 100644 (file)
--- a/board/xilinx/ml401/xparameters.h
+++ b/board/xilinx/ml401/xparameters.h
@@ -41,8 +41,8 @@
 #define XILINX_TIMER_IRQ       0
 
 /* Uart pheriphery is RS232_Uart */
-#define XILINX_UART_BASEADDR   0x40600000
-#define XILINX_UART_BAUDRATE   115200
+#define XILINX_UARTLITE_BASEADDR       0x40600000
+#define XILINX_UARTLITE_BAUDRATE       115200
 
 /* IIC pheriphery is IIC_EEPROM */
 #define XILINX_IIC_0_BASEADDR  0x40800000

diff --git a/board/xilinx/xupv2p/xparameters.h b/board/xilinx/xupv2p/xparameters.h
index 19b81fd..9e5ebda 100644 (file)
--- a/board/xilinx/xupv2p/xparameters.h
+++ b/board/xilinx/xupv2p/xparameters.h
@@ -37,8 +37,8 @@
 #define XILINX_TIMER_IRQ       1
 
 /* Uart pheriphery is RS232_Uart_1 */
-#define XILINX_UART_BASEADDR   0x40600000
-#define XILINX_UART_BAUDRATE   115200
+#define XILINX_UARTLITE_BASEADDR       0x40600000
+#define XILINX_UARTLITE_BAUDRATE       115200
 
 /* GPIO is LEDs_4Bit*/
 #define XILINX_GPIO_BASEADDR   0x40000000

diff --git a/include/configs/ml401.h b/include/configs/ml401.h
index 6db1c1a..1a2cb0a 100644 (file)
--- a/include/configs/ml401.h
+++ b/include/configs/ml401.h
@@ -32,10 +32,23 @@
 #define        CONFIG_ML401            1       /* ML401 Board */
 
 /* 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 */
 /*#define      CFG_RESET_ADDRESS       TEXT_BASE*/

diff --git a/include/configs/xupv2p.h b/include/configs/xupv2p.h
index eef4f72..f86b3b9 100644 (file)
--- 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