mirror of https://gitee.com/openkylin/linux.git
[ARM] 3662/1: ixp23xx: don't include asm/hardware.h in uncompress.h
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>
This commit is contained in:
parent
313f53e382
commit
02c4293194
|
@ -295,15 +295,4 @@
|
|||
#define IXP23XX_PCI_CPP_ADDR_BITS IXP23XX_PCI_CSR(0x0160)
|
||||
|
||||
|
||||
#ifndef __ASSEMBLY__
|
||||
/*
|
||||
* Is system memory on the XSI or CPP bus?
|
||||
*/
|
||||
static inline unsigned ixp23xx_cpp_boot(void)
|
||||
{
|
||||
return (*IXP23XX_EXP_CFG0 & IXP23XX_EXP_CFG0_XSI_NOT_PRES);
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
#endif
|
||||
|
|
|
@ -43,5 +43,15 @@ extern struct sys_timer ixp23xx_timer;
|
|||
|
||||
#define IXP23XX_UART_XTAL 14745600
|
||||
|
||||
#ifndef __ASSEMBLY__
|
||||
/*
|
||||
* Is system memory on the XSI or CPP bus?
|
||||
*/
|
||||
static inline unsigned ixp23xx_cpp_boot(void)
|
||||
{
|
||||
return (*IXP23XX_EXP_CFG0 & IXP23XX_EXP_CFG0_XSI_NOT_PRES);
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
#endif
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
#ifndef __ASM_ARCH_UNCOMPRESS_H
|
||||
#define __ASM_ARCH_UNCOMPRESS_H
|
||||
|
||||
#include <asm/hardware.h>
|
||||
#include <asm/arch/ixp23xx.h>
|
||||
#include <linux/serial_reg.h>
|
||||
|
||||
#define UART_BASE ((volatile u32 *)IXP23XX_UART1_PHYS)
|
||||
|
|
Loading…
Reference in New Issue