Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1ea64615 authored by Jeremy Kerr's avatar Jeremy Kerr Committed by Nicolas Pitre
Browse files

arm/debug: consolidate addruart macros for CONFIG_DEBUG_ICEDCC 



We have the same (empty) macro for all IDEDCC flavours, so consolidate
it to one.

Signed-off-by: default avatarJeremy Kerr <jeremy.kerr@canonical.com>
parent d71e3eb5

arch/arm/kernel/debug.S

+2 −11
Original line number Original line Diff line number Diff line
@@ -22,11 +22,11 @@ 
#if defined(CONFIG_DEBUG_ICEDCC)

#if defined(CONFIG_DEBUG_ICEDCC)

		@@ debug using ARM EmbeddedICE DCC channel

		@@ debug using ARM EmbeddedICE DCC channel





#if defined(CONFIG_CPU_V6)



		.macro	addruart, rx, tmp

		.macro	addruart, rx, tmp

		.endm

		.endm





#if defined(CONFIG_CPU_V6)



		.macro	senduart, rd, rx

		.macro	senduart, rd, rx

		mcr	p14, 0, \rd, c0, c5, 0

		mcr	p14, 0, \rd, c0, c5, 0

		.endm

		.endm
@@ -51,9 +51,6 @@ 




#elif defined(CONFIG_CPU_V7)

#elif defined(CONFIG_CPU_V7)





		.macro	addruart, rx, tmp

		.endm



		.macro	senduart, rd, rx

		.macro	senduart, rd, rx

		mcr	p14, 0, \rd, c0, c5, 0

		mcr	p14, 0, \rd, c0, c5, 0

		.endm

		.endm
@@ -71,9 +68,6 @@ wait: mrc p14, 0, pc, c0, c1, 0 




#elif defined(CONFIG_CPU_XSCALE)

#elif defined(CONFIG_CPU_XSCALE)





		.macro	addruart, rx, tmp

		.endm



		.macro	senduart, rd, rx

		.macro	senduart, rd, rx

		mcr	p14, 0, \rd, c8, c0, 0

		mcr	p14, 0, \rd, c8, c0, 0

		.endm

		.endm
@@ -98,9 +92,6 @@ wait: mrc p14, 0, pc, c0, c1, 0 




#else

#else





		.macro	addruart, rx, tmp

		.endm



		.macro	senduart, rd, rx

		.macro	senduart, rd, rx

		mcr	p14, 0, \rd, c1, c0, 0

		mcr	p14, 0, \rd, c1, c0, 0

		.endm

		.endm