Commit b9ab19f9 authored Mar 25, 2011 by Thomas Abraham Committed by Kukjin Kim Mar 28, 2011

ARM: EXYNOS4: Fix addruart macro



Fix incorrect conditional execution of ldr instructions in
addruart macro.

Signed-off-by: Thomas Abraham <thomas.abraham@samsung.com>
Signed-off-by: Abhilash Kesavan <a.kesavan@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>

parent 1af3c672

arch/arm/mach-exynos4/include/mach/debug-macro.S

+2 −2

Original line number	Diff line number	Diff line
		@@ -21,8 +21,8 @@
		*/

		.macro addruart, rp, rv
		ldreq \rp, = S3C_PA_UART
		ldrne \rv, = S3C_VA_UART
		ldr \rp, = S3C_PA_UART
		ldr \rv, = S3C_VA_UART
		#if CONFIG_DEBUG_S3C_UART != 0
		add \rp, \rp, #(0x10000 * CONFIG_DEBUG_S3C_UART)
		add \rv, \rv, #(0x10000 * CONFIG_DEBUG_S3C_UART)

Admin message