Merge branch 'mpc86xx'

[oweals/u-boot.git] / cpu / mcf52x2 / serial.c

diff --git a/cpu/mcf52x2/serial.c b/cpu/mcf52x2/serial.c
index 1cde1b6883de26eac60f26a28983ecc030b12c4b..10117889adac9933534c316874191160acd18440 100644 (file)
--- a/cpu/mcf52x2/serial.c
+++ b/cpu/mcf52x2/serial.c
@@ -23,6 +23,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <watchdog.h>
 
 #include <asm/mcfuart.h>
 
@@ -105,7 +106,7 @@ void rs_serial_init(int port,int baudrate)
 
        /* Set clock Select Register: Tx/Rx clock is timer */
        uartp[MCFUART_UCSR] = MCFUART_UCSR_RXCLKTIMER | MCFUART_UCSR_TXCLKTIMER;
-       
+
        rs_serial_setbaudrate(port,baudrate);
 
        /* Enable Tx/Rx */
@@ -174,7 +175,9 @@ void serial_puts (const char *s) {
 }
 
 int serial_getc(void) {
-       while(!rs_is_char());
+       while(!rs_is_char())
+               WATCHDOG_RESET();
+
        return rs_get_char();
 }