imported Freescale specific U-Boot additions for i.MX28,... release L2.6.31_10.08.01

[karo-tx-uboot.git] / board / xilinx / ml300 / serial.c

diff --git a/board/xilinx/ml300/serial.c b/board/xilinx/ml300/serial.c
index c204b88e415bae025f8829025b4af8e642355624..4215513375b2c25525fe4462af87fa69f8ae5eef 100755 (executable)
--- a/board/xilinx/ml300/serial.c
+++ b/board/xilinx/ml300/serial.c
@@ -36,19 +36,18 @@
  *
  */
 
+#include <common.h>
 #include <asm/u-boot.h>
 #include <asm/processor.h>
-#include <common.h>
 #include <command.h>
-#include <configs/ml300.h>
-#include "xparameters.h"
+#include <config.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
 #define USE_CHAN1 \
-       ((defined XPAR_UARTNS550_0_BASEADDR) && (defined CFG_INIT_CHAN1))
+       ((defined XPAR_UARTNS550_0_BASEADDR) && (defined CONFIG_SYS_INIT_CHAN1))
 #define USE_CHAN2 \
-       ((defined XPAR_UARTNS550_1_BASEADDR) && (defined CFG_INIT_CHAN2))
+       ((defined XPAR_UARTNS550_1_BASEADDR) && (defined CONFIG_SYS_INIT_CHAN2))
 
 #if USE_CHAN1
 #include <ns16550.h>
@@ -83,21 +82,21 @@ void
 serial_putc(const char c)
 {
        if (c == '\n')
-               NS16550_putc(COM_PORTS[CFG_DUART_CHAN], '\r');
+               NS16550_putc(COM_PORTS[CONFIG_SYS_DUART_CHAN], '\r');
 
-       NS16550_putc(COM_PORTS[CFG_DUART_CHAN], c);
+       NS16550_putc(COM_PORTS[CONFIG_SYS_DUART_CHAN], c);
 }
 
 int
 serial_getc(void)
 {
-       return NS16550_getc(COM_PORTS[CFG_DUART_CHAN]);
+       return NS16550_getc(COM_PORTS[CONFIG_SYS_DUART_CHAN]);
 }
 
 int
 serial_tstc(void)
 {
-       return NS16550_tstc(COM_PORTS[CFG_DUART_CHAN]);
+       return NS16550_tstc(COM_PORTS[CONFIG_SYS_DUART_CHAN]);
 }
 
 void
@@ -123,7 +122,7 @@ serial_puts(const char *s)
        }
 }
 
-#if (CONFIG_COMMANDS & CFG_CMD_KGDB)
+#if defined(CONFIG_CMD_KGDB)
 void
 kgdb_serial_init(void)
 {
@@ -152,4 +151,4 @@ kgdb_interruptible(int yes)
 {
        return;
 }
-#endif                         /* CFG_CMD_KGDB */
+#endif