From 36736c86ae41d3d0d25381ab3d96bcc5a5960234 Mon Sep 17 00:00:00 2001
From: Eric Miao <eric.miao@marvell.com>
Date: Mon, 2 Jun 2008 15:58:03 +0800
Subject: [PATCH] --- yaml --- r: 105154 b: refs/heads/master c:
 6d3dfe4a3141476a3cf59ce6d2d1c25f9b5cfae8 h: refs/heads/master v: v3

---
 [refs]                                      |  2 +-
 trunk/include/asm-arm/arch-pxa/uncompress.h | 13 +++++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 5429cdde4a19..6061a57fce9c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b18773d545e65fe442479e3f9853c8ebb8ec45d6
+refs/heads/master: 6d3dfe4a3141476a3cf59ce6d2d1c25f9b5cfae8
diff --git a/trunk/include/asm-arm/arch-pxa/uncompress.h b/trunk/include/asm-arm/arch-pxa/uncompress.h
index dadf4c20b622..f4551269aaf2 100644
--- a/trunk/include/asm-arm/arch-pxa/uncompress.h
+++ b/trunk/include/asm-arm/arch-pxa/uncompress.h
@@ -11,11 +11,11 @@
 
 #include <linux/serial_reg.h>
 #include <asm/arch/pxa-regs.h>
+#include <asm/mach-types.h>
 
-#define __REG(x)	((volatile unsigned long *)x)
-
-#define UART		FFUART
+#define __REG(x)       ((volatile unsigned long *)x)
 
+static volatile unsigned long *UART = FFUART;
 
 static inline void putc(char c)
 {
@@ -33,8 +33,13 @@ static inline void flush(void)
 {
 }
 
+static inline void arch_decomp_setup(void)
+{
+	if (machine_is_littleton())
+		UART = STUART;
+}
+
 /*
  * nothing to do
  */
-#define arch_decomp_setup()
 #define arch_decomp_wdog()