board/bsc9131rdb:Add NAND boot support using new SPL format

[oweals/u-boot.git] / board / linkstation / avr.c

diff --git a/board/linkstation/avr.c b/board/linkstation/avr.c
index fda1b913eb6750213f7ce1b8d716eb4e8641f604..ec6d400d34e6dcb420116c684c0328e119b23486 100644 (file)
--- a/board/linkstation/avr.c
+++ b/board/linkstation/avr.c
@@ -22,7 +22,7 @@
  */
 #include <common.h>
 #include <ns16550.h>
-#include <console.h>
+#include <stdio_dev.h>
 
 /* Button codes from the AVR */
 #define PWRR                   0x20            /* Power button release */
@@ -90,12 +90,12 @@ void init_AVR_DUART (void)
         */
        AVR_port->lcr = 0x00;
        AVR_port->ier = 0x00;
-       AVR_port->lcr = LCR_BKSE;
+       AVR_port->lcr = UART_LCR_BKSE;
        AVR_port->dll = clock_divisor & 0xff;
        AVR_port->dlm = (clock_divisor >> 8) & 0xff;
-       AVR_port->lcr = LCR_WLS_8 | LCR_PEN | LCR_EPS;
+       AVR_port->lcr = UART_LCR_WLS_8 | UART_LCR_PEN | UART_LCR_EPS;
        AVR_port->mcr = 0x00;
-       AVR_port->fcr = FCR_FIFO_EN | FCR_RXSR | FCR_TXSR;
+       AVR_port->fcr = UART_FCR_FIFO_EN | UART_FCR_RXSR | UART_FCR_TXSR;
 
        miconCntl_DisWDT();