Skip to content

Commit

Permalink
msm: fix debug-macro.S build failure
Browse files Browse the repository at this point in the history
Originally there was an ifdef case to handle when no debug uart
was selected. In commit 0ea1293
that case was removed which causes the following build failure,

linux-2.6/arch/arm/kernel/debug.S: Assembler messages:
linux-2.6/arch/arm/kernel/debug.S:174: Error: bad instruction `addruart r1,r2'
linux-2.6/arch/arm/kernel/debug.S:176: Error: bad instruction `waituart r2,r3'
linux-2.6/arch/arm/kernel/debug.S:177: Error: bad instruction `senduart r1,r3'
linux-2.6/arch/arm/kernel/debug.S:178: Error: bad instruction `busyuart r2,r3'
linux-2.6/arch/arm/kernel/debug.S:190: Error: bad instruction `addruart r1,r2'

This is a partial revert to add back the case which was removed with
two caveats. First the API for the addruart macro was updated, and
the new addruart case now return 0xfff00000 so that a know IO mapping
is created instead of a random one.

Cc: Jeremy Kerr <jeremy.kerr@canonical.com>
Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Cc: Jason Wang <jason77.wang@gmail.com>
Cc: Tony Lindgren <tony@atomide.com>
Cc: Nicolas Pitre <nico@fluxnic.net>
Cc: Russell King - ARM Linux <linux@arm.linux.org.uk>
Signed-off-by: Daniel Walker <dwalker@codeaurora.org>
  • Loading branch information
Daniel Walker committed Oct 29, 2010
1 parent 6f94196 commit bcd72c3
Showing 1 changed file with 12 additions and 1 deletion.
13 changes: 12 additions & 1 deletion arch/arm/mach-msm/include/mach/debug-macro.S
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,18 @@
tst \rd, #0x04
beq 1001b
.endm
#else
.macro addruart, rp, rv
mov \rv, #0xff000000
orr \rv, \rv, #0x00f00000
.endm

.macro busyuart,rd,rx
.macro senduart,rd,rx
.endm

.macro waituart,rd,rx
.endm
#endif

.macro busyuart,rd,rx
.endm

0 comments on commit bcd72c3

Please sign in to comment.