rename CFG_ macros to CONFIG_SYS

[platform/kernel/u-boot.git] / board / ml2 / serial.c

diff --git a/board/ml2/serial.c b/board/ml2/serial.c
index c18815b..d9113ab 100644 (file)
--- a/board/ml2/serial.c
+++ b/board/ml2/serial.c
@@ -25,26 +25,26 @@
 #include <command.h>
 #include <configs/ML2.h>
 
-#if (defined CFG_INIT_CHAN1) || (defined CFG_INIT_CHAN2)
+#if (defined CONFIG_SYS_INIT_CHAN1) || (defined CONFIG_SYS_INIT_CHAN2)
 #include <ns16550.h>
 #endif
 
 DECLARE_GLOBAL_DATA_PTR;
 
-#if (defined CFG_INIT_CHAN1) || (defined CFG_INIT_CHAN2)
-const NS16550_t COM_PORTS[] = { (NS16550_t) CFG_NS16550_COM1,
-       (NS16550_t) CFG_NS16550_COM2
+#if (defined CONFIG_SYS_INIT_CHAN1) || (defined CONFIG_SYS_INIT_CHAN2)
+const NS16550_t COM_PORTS[] = { (NS16550_t) CONFIG_SYS_NS16550_COM1,
+       (NS16550_t) CONFIG_SYS_NS16550_COM2
 };
 #endif
 
 int serial_init (void)
 {
-       int clock_divisor = CFG_NS16550_CLK / 16 / gd->baudrate;
+       int clock_divisor = CONFIG_SYS_NS16550_CLK / 16 / gd->baudrate;
 
-#ifdef CFG_INIT_CHAN1
+#ifdef CONFIG_SYS_INIT_CHAN1
        (void) NS16550_init (COM_PORTS[0], clock_divisor);
 #endif
-#ifdef CFG_INIT_CHAN2
+#ifdef CONFIG_SYS_INIT_CHAN2
        (void) NS16550_init (COM_PORTS[1], clock_divisor);
 #endif
        return 0;
@@ -54,29 +54,29 @@ int serial_init (void)
 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 serial_setbrg (void)
 {
-       int clock_divisor = CFG_NS16550_CLK / 16 / gd->baudrate;
+       int clock_divisor = CONFIG_SYS_NS16550_CLK / 16 / gd->baudrate;
 
-#ifdef CFG_INIT_CHAN1
+#ifdef CONFIG_SYS_INIT_CHAN1
        NS16550_reinit (COM_PORTS[0], clock_divisor);
 #endif
-#ifdef CFG_INIT_CHAN2
+#ifdef CONFIG_SYS_INIT_CHAN2
        NS16550_reinit (COM_PORTS[1], clock_divisor);
 #endif
 }