Merge branch 'master' of /home/stefan/git/u-boot/u-boot

[oweals/u-boot.git] / drivers / serial / mcfuart.c

diff --git a/drivers/serial/mcfuart.c b/drivers/serial/mcfuart.c
index f54aabec2684e2757d8e177d05120572375d1a60..88f3eb10abf8f3b4b67d5459b503cb3b6f8e7830 100644 (file)
--- a/drivers/serial/mcfuart.c
+++ b/drivers/serial/mcfuart.c
@@ -28,12 +28,16 @@
  */
 
 #include <common.h>
+
+#ifdef CONFIG_MCFUART
+
 #include <asm/immap.h>
 #include <asm/uart.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
-#ifdef CONFIG_MCFSERIAL
+extern void uart_port_conf(void);
+
 int serial_init(void)
 {
        volatile uart_t *uart;
@@ -41,6 +45,8 @@ int serial_init(void)
 
        uart = (volatile uart_t *)(CFG_UART_BASE);
 
+       uart_port_conf();
+
        /* write to SICR: SIM2 = uart mode,dcd does not affect rx */
        uart->ucr = UART_UCR_RESET_RX;
        uart->ucr = UART_UCR_RESET_TX;
@@ -124,4 +130,4 @@ void serial_setbrg(void)
 
        uart->ucr = UART_UCR_RX_ENABLED | UART_UCR_TX_ENABLED;
 }
-#endif                         /* CONFIG_MCFSERIAL */
+#endif                         /* CONFIG_MCFUART */