Commit cc56449f authored by Russell King's avatar Russell King
Browse files

[PATCH] ARM: fix debug macros 



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

Signed-off-by: default avatarRussell King <rmk@arm.linux.org.uk>
parent 684f970e

include/asm-arm/arch-ebsa285/debug-macro.S

+5 −2
Original line number Diff line number Diff line
@@ -45,9 +45,12 @@ 
		.equ	dc21285_low,  ARMCSR_BASE & 0x00ffffff



		.macro	addruart,rx

		mov	\rx, #dc21285_high

		mrc	p15, 0, \rx, c1, c0

		tst	\rx, #1			@ MMU enabled?

		moveq	\rx, #0x42000000

		movne	\rx, #dc21285_high

		.if	dc21285_low

		orr	\rx, \rx, #dc21285_low

		orrne	\rx, \rx, #dc21285_low

		.endif

		.endm

include/asm-arm/arch-rpc/debug-macro.S

+4 −1
Original line number Diff line number Diff line
@@ -12,7 +12,10 @@ 
*/



		.macro	addruart,rx

		mov	\rx, #0xe0000000

		mrc	p15, 0, \rx, c1, c0

		tst	\rx, #1			@ MMU enabled?

		moveq	\rx, #0x03000000

		movne	\rx, #0xe0000000

		orr	\rx, \rx, #0x00010000

		orr	\rx, \rx, #0x00000fe0

		.endm

CRA Git | Maintained and supported by SUSTech CRA and CCSE