diff options
| author | Lennert Buytenhek <buytenh@wantstofly.org> | 2006-06-27 22:56:16 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-06-28 17:54:56 +0100 |
| commit | 02c4293194432c7466efe9477126d6179d6fda07 (patch) | |
| tree | 53e75380efdd207de95e219fd7882ce95f514bed /include/asm-arm/arch-ixp23xx/platform.h | |
| parent | 313f53e3823c00bd0aa3601f01897573f2fc326d (diff) | |
| download | blackbird-op-linux-02c4293194432c7466efe9477126d6179d6fda07.tar.gz blackbird-op-linux-02c4293194432c7466efe9477126d6179d6fda07.zip | |
[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>
Diffstat (limited to 'include/asm-arm/arch-ixp23xx/platform.h')
| -rw-r--r-- | include/asm-arm/arch-ixp23xx/platform.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/include/asm-arm/arch-ixp23xx/platform.h b/include/asm-arm/arch-ixp23xx/platform.h index 19a73b39c864..56e16d66645a 100644 --- a/include/asm-arm/arch-ixp23xx/platform.h +++ b/include/asm-arm/arch-ixp23xx/platform.h @@ -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 |
