From: Masahiro Yamada <yamada.m@jp.panasonic.com>
Date: Mon, 1 Sep 2014 02:06:35 +0000 (+0900)
Subject: arm: debug: adjust for U-Boot
X-Git-Tag: v2015.01-rc1~3^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b81fa615df129f29d343abb382392ca4ef17bdc6;p=platform%2Fkernel%2Fu-boot.git

arm: debug: adjust for U-Boot

Because CONFIG_MMU is never defined in U-Boot,
the non-MMU code in debug.S is always used.

Unfortunately, the number of arguments of the addruart macro
in Linux is different between MMU and non-MMU.
This causes a build error when importing some debug macros
using the third argument. (For ex. arch/arm/include/debug/exynos.S)
Pass the third argument to the non-MMU addruart to avoid such a problem.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Tested-by: Przemyslaw Marczak <p.marczak@samsung.com>
---

diff --git a/arch/arm/lib/debug.S b/arch/arm/lib/debug.S
index ddee7c09c8..760ba74a3c 100644
--- a/arch/arm/lib/debug.S
+++ b/arch/arm/lib/debug.S
@@ -33,7 +33,7 @@
 
 #else /* !CONFIG_MMU */
 		.macro	addruart_current, rx, tmp1, tmp2
-		addruart	\rx, \tmp1
+		addruart	\rx, \tmp1, \tmp2
 		.endm
 
 #endif /* CONFIG_MMU */