From b81fa615df129f29d343abb382392ca4ef17bdc6 Mon Sep 17 00:00:00 2001 From: Masahiro Yamada Date: Mon, 1 Sep 2014 11:06:35 +0900 Subject: 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 Tested-by: Przemyslaw Marczak --- arch/arm/lib/debug.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arch') 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 */ -- cgit v1.2.1