02c4293194
Patch from Lennert Buytenhek ixp23xx was including asm/hardware.h in its version of uncompress.h, to get at the physical address of the debug UART, but this include was causing various inline functions that are totally unrelated to the decompressor, defined in headers in include/asm-arm/arch-ixp23xx, to be included in the decompressor image. Include asm/arch/ixp23xx.h instead, and move the sole inline function in ixp23xx.h to another header. Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
41 lines
747 B
C
41 lines
747 B
C
/*
|
|
* include/asm-arm/arch-ixp23xx/uncompress.h
|
|
*
|
|
* Copyright (C) 2002-2004 Intel Corporation.
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License version 2 as
|
|
* published by the Free Software Foundation.
|
|
*/
|
|
|
|
#ifndef __ASM_ARCH_UNCOMPRESS_H
|
|
#define __ASM_ARCH_UNCOMPRESS_H
|
|
|
|
#include <asm/arch/ixp23xx.h>
|
|
#include <linux/serial_reg.h>
|
|
|
|
#define UART_BASE ((volatile u32 *)IXP23XX_UART1_PHYS)
|
|
|
|
static inline void putc(char c)
|
|
{
|
|
int j;
|
|
|
|
for (j = 0; j < 0x1000; j++) {
|
|
if (UART_BASE[UART_LSR] & UART_LSR_THRE)
|
|
break;
|
|
barrier();
|
|
}
|
|
|
|
UART_BASE[UART_TX] = c;
|
|
}
|
|
|
|
static inline void flush(void)
|
|
{
|
|
}
|
|
|
|
#define arch_decomp_setup()
|
|
#define arch_decomp_wdog()
|
|
|
|
|
|
#endif
|