diff mbox

[U-Boot,v3,6/6] arm: debug: adjust for U-Boot

Message ID 1409537195-2726-7-git-send-email-yamada.m@jp.panasonic.com
State Accepted
Delegated to: Albert ARIBAUD
Headers show

Commit Message

Masahiro Yamada Sept. 1, 2014, 2:06 a.m. UTC 
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>
---

Changes in v3: None
Changes in v2:
  - Newly added

 arch/arm/lib/debug.S | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff mbox

Patch

diff --git a/arch/arm/lib/debug.S b/arch/arm/lib/debug.S
index ddee7c0..760ba74 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 */