b53e9b5ebd
Because of the include of the decompress_inflate.c file from boot/compress/misc.c, there are different flush() defines: In file included from arch/arm/boot/compressed/misc.c:249: arch/arm/boot/compressed/../../../../lib/decompress_inflate.c:138:29: error: macro "flush" passed 2 arguments, but takes just 0 Fix this by removing the define of flush() in misc.c for CONFIG_DEBUG_ICEDCC as it's already defined in mach/uncompress.h, and that is being included unconditionally. Also use a static inline function instead of define for mach-mxc and mach-gemini to avoid similar bug for those platforms. Signed-off-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
44 lines
1.1 KiB
C
44 lines
1.1 KiB
C
/*
|
|
* Copyright (C) 2008-2009 Paulius Zaleckas <paulius.zaleckas@teltonika.lt>
|
|
*
|
|
* Based on mach-pxa/include/mach/uncompress.h:
|
|
* Copyright: (C) 2001 MontaVista Software Inc.
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*/
|
|
|
|
#ifndef __MACH_UNCOMPRESS_H
|
|
#define __MACH_UNCOMPRESS_H
|
|
|
|
#include <linux/serial_reg.h>
|
|
#include <mach/hardware.h>
|
|
|
|
static volatile unsigned long *UART = (unsigned long *)GEMINI_UART_BASE;
|
|
|
|
/*
|
|
* The following code assumes the serial port has already been
|
|
* initialized by the bootloader. If you didn't setup a port in
|
|
* your bootloader then nothing will appear (which might be desired).
|
|
*/
|
|
static inline void putc(char c)
|
|
{
|
|
while (!(UART[UART_LSR] & UART_LSR_THRE))
|
|
barrier();
|
|
UART[UART_TX] = c;
|
|
}
|
|
|
|
static inline void flush(void)
|
|
{
|
|
}
|
|
|
|
/*
|
|
* nothing to do
|
|
*/
|
|
#define arch_decomp_setup()
|
|
|
|
#define arch_decomp_wdog()
|
|
|
|
#endif /* __MACH_UNCOMPRESS_H */
|