Commit b53e9b5e authored by Tony Lindgren's avatar Tony Lindgren Committed by Russell King

ARM: 5882/1: ARM: Fix uncompress code compile for different defines of flush(void)

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: default avatarTony Lindgren <tony@atomide.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 95b8f20f
...@@ -88,7 +88,6 @@ static void icedcc_putc(int ch) ...@@ -88,7 +88,6 @@ static void icedcc_putc(int ch)
#endif #endif
#define putc(ch) icedcc_putc(ch) #define putc(ch) icedcc_putc(ch)
#define flush() do { } while (0)
#endif #endif
static void putstr(const char *ptr) static void putstr(const char *ptr)
......
...@@ -30,7 +30,9 @@ static inline void putc(char c) ...@@ -30,7 +30,9 @@ static inline void putc(char c)
UART[UART_TX] = c; UART[UART_TX] = c;
} }
#define flush() do { } while (0) static inline void flush(void)
{
}
/* /*
* nothing to do * nothing to do
......
...@@ -60,7 +60,9 @@ static void putc(int ch) ...@@ -60,7 +60,9 @@ static void putc(int ch)
UART(TXR) = ch; UART(TXR) = ch;
} }
#define flush() do { } while (0) static inline void flush(void)
{
}
#define MX1_UART1_BASE_ADDR 0x00206000 #define MX1_UART1_BASE_ADDR 0x00206000
#define MX25_UART1_BASE_ADDR 0x43f90000 #define MX25_UART1_BASE_ADDR 0x43f90000
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment