Commit 03e5386e authored by Quinn Jensen's avatar Quinn Jensen Committed by Russell King

[ARM] 4530/1: MXC: fix elf_hwcap compile breakage as in iop13xx

MXC needs the same change as IOP.  See [ARM] 4494/1
or commit 7dea1b20

An undefined reference to elf_hwcap prevents linkage, due
to changes made by f884b1cf
and d1cbbd6b

Removing processor.h removes the extern definition of
elf_hwcap, which fixes the link issue, but forgets cpu_relax().
So, instead, we'll call barrier() directly.

Cc: Lennert Buytenhek <kernel@wantstofly.org>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Acked-by: default avatarRoss Wille <wille@freescale.com>
Signed-off-by: default avatarQuinn Jensen <quinn.jensen@freescale.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent cc46f659
...@@ -26,7 +26,6 @@ ...@@ -26,7 +26,6 @@
#define __MXC_BOOT_UNCOMPRESS #define __MXC_BOOT_UNCOMPRESS
#include <asm/hardware.h> #include <asm/hardware.h>
#include <asm/processor.h>
#define UART(x) (*(volatile unsigned long *)(serial_port + (x))) #define UART(x) (*(volatile unsigned long *)(serial_port + (x)))
...@@ -62,7 +61,7 @@ static void putc(int ch) ...@@ -62,7 +61,7 @@ static void putc(int ch)
} }
while (!(UART(USR2) & USR2_TXFE)) while (!(UART(USR2) & USR2_TXFE))
cpu_relax(); barrier();
UART(TXR) = ch; UART(TXR) = ch;
} }
......
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