rk: uncompress.h: add debug_uart.h and support timeout on putc

diff --git a/arch/arm/plat-rk/include/plat/uncompress.h b/arch/arm/plat-rk/include/plat/uncompress.h
index 9704769e6a42c70d5355fc72a2c934130c74e5b3..2d542adf6a68d378c5740370584e0078aaf8c17c 100644 (file)
--- a/arch/arm/plat-rk/include/plat/uncompress.h
+++ b/arch/arm/plat-rk/include/plat/uncompress.h
@@ -3,13 +3,15 @@
 
 #include <linux/serial_reg.h>
 #include <mach/io.h>
+#include <mach/debug_uart.h>
 
 #ifdef DEBUG_UART_PHYS
 static volatile u32 *UART = (u32 *)DEBUG_UART_PHYS;
 
 static void putc(int c)
 {
-       while (!(UART[UART_LSR] & UART_LSR_THRE))
+       int i = 1000;
+       while (i-- && !(UART[UART_LSR] & UART_LSR_THRE))
                barrier();
        UART[UART_TX] = c;
 }