git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
include
/
asm-arm
/
arch-ixp4xx
/
uncompress.h
diff --git
a/include/asm-arm/arch-ixp4xx/uncompress.h
b/include/asm-arm/arch-ixp4xx/uncompress.h
index
29692ec
..
09ae6c9
100644
(file)
--- a/
include/asm-arm/arch-ixp4xx/uncompress.h
+++ b/
include/asm-arm/arch-ixp4xx/uncompress.h
@@
-21,34
+21,26
@@
static volatile u32* uart_base;
static volatile u32* uart_base;
-static
__inline__ void putc(char
c)
+static
inline void putc(int
c)
{
/* Check THRE and TEMT bits before we transmit the character.
*/
{
/* Check THRE and TEMT bits before we transmit the character.
*/
- while ((uart_base[UART_LSR] & TX_DONE) != TX_DONE);
+ while ((uart_base[UART_LSR] & TX_DONE) != TX_DONE)
+ barrier();
+
*uart_base = c;
}
*uart_base = c;
}
-/*
- * This does not append a newline
- */
-static void puts(const char *s)
+static void flush(void)
{
{
- while (*s)
- {
- putc(*s);
- if (*s == '\n')
- putc('\r');
- s++;
- }
}
static __inline__ void __arch_decomp_setup(unsigned long arch_id)
{
/*
}
static __inline__ void __arch_decomp_setup(unsigned long arch_id)
{
/*
- * Coyote
only has
UART2 connected
+ * Coyote
and gtwx5715 only have
UART2 connected
*/
*/
- if (machine_is_adi_coyote())
+ if (machine_is_adi_coyote()
|| machine_is_gtwx5715()
)
uart_base = (volatile u32*) IXP4XX_UART2_BASE_PHYS;
else
uart_base = (volatile u32*) IXP4XX_UART1_BASE_PHYS;
uart_base = (volatile u32*) IXP4XX_UART2_BASE_PHYS;
else
uart_base = (volatile u32*) IXP4XX_UART1_BASE_PHYS;