summaryrefslogtreecommitdiffstats
path: root/include/asm-arm/arch-shark
diff options
context:
space:
mode:
authorRussell King2006-03-28 11:24:33 +0200
committerRussell King2006-03-28 11:24:33 +0200
commita081568d7016061ed848696984e3acf1ba0b3054 (patch)
tree5a6cd28d51e3c0b694499f4d0795b22a3d020eba /include/asm-arm/arch-shark
parent[ARM] proc-v6: mark page table walks outer-cacheable, shared. Enable NX. (diff)
downloadkernel-qcow2-linux-a081568d7016061ed848696984e3acf1ba0b3054.tar.gz
kernel-qcow2-linux-a081568d7016061ed848696984e3acf1ba0b3054.tar.xz
kernel-qcow2-linux-a081568d7016061ed848696984e3acf1ba0b3054.zip
[ARM] Fix decompressor serial IO to give CRLF not LFCR
As per the corresponding change to the serial drivers, arrange for ARM decompressors to give CRLF. Move the common putstr code into misc.c such that machines only need to supply "putc" and "flush" functions. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'include/asm-arm/arch-shark')
-rw-r--r--include/asm-arm/arch-shark/uncompress.h13
1 files changed, 2 insertions, 11 deletions
diff --git a/include/asm-arm/arch-shark/uncompress.h b/include/asm-arm/arch-shark/uncompress.h
index 910a8e0a0ca5..7eca6534f1bb 100644
--- a/include/asm-arm/arch-shark/uncompress.h
+++ b/include/asm-arm/arch-shark/uncompress.h
@@ -9,7 +9,7 @@
#define SERIAL_BASE ((volatile unsigned char *)0x400003f8)
-static __inline__ void putc(char c)
+static inline void putc(int c)
{
int t;
@@ -18,17 +18,8 @@ static __inline__ void putc(char c)
while (t--);
}
-/*
- * This does not append a newline
- */
-static void putstr(const char *s)
+static inline void flush(void)
{
- while (*s) {
- putc(*s);
- if (*s == '\n')
- putc('\r');
- s++;
- }
}
#ifdef DEBUG