Skip to content

Commit

Permalink
[ARM] 4530/1: MXC: fix elf_hwcap compile breakage as in iop13xx
Browse files Browse the repository at this point in the history
MXC needs the same change as IOP.  See [ARM] 4494/1
or commit 7dea1b2

An undefined reference to elf_hwcap prevents linkage, due
to changes made by f884b1c
and d1cbbd6

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: Ross Wille <wille@freescale.com>
Signed-off-by: Quinn Jensen <quinn.jensen@freescale.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  • Loading branch information
Quinn Jensen authored and Russell King committed Jul 28, 2007
1 parent cc46f65 commit 03e5386
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions include/asm-arm/arch-mxc/uncompress.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
#define __MXC_BOOT_UNCOMPRESS

#include <asm/hardware.h>
#include <asm/processor.h>

#define UART(x) (*(volatile unsigned long *)(serial_port + (x)))

Expand Down Expand Up @@ -62,7 +61,7 @@ static void putc(int ch)
}

while (!(UART(USR2) & USR2_TXFE))
cpu_relax();
barrier();

UART(TXR) = ch;
}
Expand Down

0 comments on commit 03e5386

Please sign in to comment.