imported Ka-Ro specific additions to U-Boot 2009.08 for TX28

[karo-tx-uboot.git] / board / MAI / AmigaOneG3SE / serial.c

diff --git a/board/MAI/AmigaOneG3SE/serial.c b/board/MAI/AmigaOneG3SE/serial.c
index b6f57c7246bd652cc33ff66159261e1e1ea891cb..84a913effb16973e5da3ade91c8c6f6f48edabff 100755 (executable)
--- a/board/MAI/AmigaOneG3SE/serial.c
+++ b/board/MAI/AmigaOneG3SE/serial.c
@@ -6,7 +6,7 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-#ifndef CFG_NS16550
+#ifndef CONFIG_SYS_NS16550
 static uint32 ComPort1;
 
 uint16 SerialEcho = 1;
@@ -75,17 +75,17 @@ void serial_init (void)
        /* COM_WRITE_BYTE(LINE_CONTROL, 0x83); */
        /* COM_WRITE_BYTE(DIVISOR_LATCH_LSB, (uint8)(clock_divisor & 0xFF)); */
        /* COM_WRITE_BYTE(DIVISOR_LATCH_MSB, (uint8)(clock_divisor >> 8)); */
-       /* __asm("eieio"); */
+       /* __asm__("eieio"); */
 
        /*  Set 8-N-1 */
        COM_WRITE_BYTE (LINE_CONTROL, 0x03);
-       __asm ("eieio");
+       __asm__ ("eieio");
 
        /*  Disable FIFO */
        COM_WRITE_BYTE (MODEM_CONTROL, 0x03);
        COM_WRITE_BYTE (FIFO_CONTROL, 0x07);
 
-       __asm ("eieio");
+       __asm__ ("eieio");
        serial_init_done = 1;
 }
 
@@ -147,8 +147,8 @@ void serial_debug_putc (int c)
 
 #else
 
-const NS16550_t Com0 = (NS16550_t) CFG_NS16550_COM1;
-const NS16550_t Com1 = (NS16550_t) CFG_NS16550_COM2;
+const NS16550_t Com0 = (NS16550_t) CONFIG_SYS_NS16550_COM1;
+const NS16550_t Com1 = (NS16550_t) CONFIG_SYS_NS16550_COM2;
 
 int serial_init (void)
 {