Merge with Linux 2.3.40.

1 files changed, 52 insertions, 0 deletions

diff --git a/include/asm-arm/arch-sa1100/uncompress.h b/include/asm-arm/arch-sa1100/uncompress.h
new file mode 100644
index 000000000..ffdad2180
--- /dev/null
+++ b/include/asm-arm/arch-sa1100/uncompress.h
@@ -0,0 +1,52 @@
+/*
+ * linux/include/asm-arm/arch-brutus/uncompress.h
+ *
+ * (C) 1999 Nicolas Pitre <nico@cam.org>
+ */
+
+#include <linux/config.h>
+
+#if defined(CONFIG_SA1100_EMPEG) || \
+    defined(CONFIG_SA1100_VICTOR) || \
+    defined(CONFIG_SA1100_LART)
+
+#include "hardware.h"
+#include "serial_reg.h"
+
+static volatile unsigned long* serial_port = (unsigned long*)_Ser3UTCR0;
+
+/*
+ * The following code assumes the serial port has already been
+ * initialized by the bootloader or such...
+ */
+
+static void puts( const char *s )
+{
+    int i;
+
+    for (i = 0; *s; i++, s++) {
+	/* wait for space in the UART's transmiter */
+	while( !(serial_port[UTSR1] & UTSR1_TNF) );
+
+	/* send the character out. */
+	serial_port[UART_TX] = *s;
+
+	/* if a LF, also do CR... */
+	if (*s == 10) {
+	    while( !(serial_port[UTSR1] & UTSR1_TNF) );
+	    serial_port[UART_TX] = 13;
+	}
+    }
+}
+
+#else
+
+#define puts( x )
+
+#endif
+
+
+/* Nothing to do for these */
+#define arch_decomp_setup()
+#define arch_decomp_wdog()
+