tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

[PATCH] ARM: fix debug macros

Fix debug EBSA285 and RiscPC debugging macros to detect whether the
MMU is enabled.

Signed-off-by: Russell King <rmk@arm.linux.org.uk>

Russell King cc56449f 684f970e

+9 -3
+5 -2
include/asm-arm/arch-ebsa285/debug-macro.S
··· 45 45 .equ dc21285_low, ARMCSR_BASE & 0x00ffffff 46 46 47 47 .macro addruart,rx 48 - mov \rx, #dc21285_high 48 + mrc p15, 0, \rx, c1, c0 49 + tst \rx, #1 @ MMU enabled? 50 + moveq \rx, #0x42000000 51 + movne \rx, #dc21285_high 49 52 .if dc21285_low 50 - orr \rx, \rx, #dc21285_low 53 + orrne \rx, \rx, #dc21285_low 51 54 .endif 52 55 .endm 53 56
+4 -1
include/asm-arm/arch-rpc/debug-macro.S
··· 12 12 */ 13 13 14 14 .macro addruart,rx 15 - mov \rx, #0xe0000000 15 + mrc p15, 0, \rx, c1, c0 16 + tst \rx, #1 @ MMU enabled? 17 + moveq \rx, #0x03000000 18 + movne \rx, #0xe0000000 16 19 orr \rx, \rx, #0x00010000 17 20 orr \rx, \rx, #0x00000fe0 18 21 .endm