Merge master.kernel.org:/home/rmk/linux-2.6-arm

* master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] 3388/1: ixp23xx: add core ixp23xx support
  [ARM] 3417/1: add support for logicpd pxa270 card engine
  [ARM] 3387/1: ixp23xx: add defconfig
  [ARM] 3377/2: add support for intel xsc3 core
  [ARM] Move ice-dcc code into misc.c
  [ARM] Fix decompressor serial IO to give CRLF not LFCR
  [ARM] proc-v6: mark page table walks outer-cacheable, shared.  Enable NX.
  [ARM] nommu: trivial patch for arch/arm/lib/Makefile
  [ARM] 3416/1: Update LART site URL
  [ARM] 3415/1: Akita: Add missing EXPORT_SYMBOL
  [ARM] 3414/1: ep93xx: reset ethernet controller before uncompressing

1 files changed, 24 insertions, 23 deletions

diff --git a/include/asm-arm/arch-ebsa110/uncompress.h b/include/asm-arm/arch-ebsa110/uncompress.h
index eee95581a923..66b19c7fd908 100644
--- a/include/asm-arm/arch-ebsa110/uncompress.h
+++ b/include/asm-arm/arch-ebsa110/uncompress.h
@@ -8,33 +8,34 @@
  * published by the Free Software Foundation.
  */
 
+#include <linux/serial_reg.h>
+
+#define SERIAL_BASE     ((unsigned char *)0xfe000be0)
+
 /*
  * This does not append a newline
  */
-static void putstr(const char *s)
+static inline void putc(int c)
+{
+        unsigned char v, *base = SERIAL_BASE;
+
+        do {
+                v = base[UART_LSR << 2];
+                barrier();
+        } while (!(v & UART_LSR_THRE));
+
+        base[UART_TX << 2] = c;
+}
+
+static inline void flush(void)
 {
-        unsigned long tmp1, tmp2;
-        __asm__ __volatile__(
-        "ldrb   %0, [%2], #1\n"
-"       teq     %0, #0\n"
-"       beq     3f\n"
-"1:     strb    %0, [%3]\n"
-"2:     ldrb    %1, [%3, #0x14]\n"
-"       and     %1, %1, #0x60\n"
-"       teq     %1, #0x60\n"
-"       bne     2b\n"
-"       teq     %0, #'\n'\n"
-"       moveq   %0, #'\r'\n"
-"       beq     1b\n"
-"       ldrb    %0, [%2], #1\n"
-"       teq     %0, #0\n"
-"       bne     1b\n"
-"3:     ldrb    %1, [%3, #0x14]\n"
-"       and     %1, %1, #0x60\n"
-"       teq     %1, #0x60\n"
-"       bne     3b"
-        : "=&r" (tmp1), "=&r" (tmp2)
-        : "r" (s), "r" (0xf0000be0) : "cc");
+        unsigned char v, *base = SERIAL_BASE;
+
+        do {
+                v = base[UART_LSR << 2];
+                barrier();
+        } while ((v & (UART_LSR_TEMT|UART_LSR_THRE)) !=
+                 (UART_LSR_TEMT|UART_LSR_THRE));
 }
 
 /*