From: 黄涛 <huangtao@rock-chips.com>
Date: Fri, 30 Aug 2013 03:30:10 +0000 (+0800)
Subject: rk: uncompress.h: add debug_uart.h and support timeout on putc
X-Git-Tag: firefly_0821_release~6672
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=0fcfd511ab4b0bd1f657f771387ce342eb975b96;p=firefly-linux-kernel-4.4.55.git

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 9704769e6a42..2d542adf6a68 100644
--- 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;
 }