path: root/arch
diff options
authorMasahiro Yamada <>2014-09-01 11:06:35 +0900
committerAlbert ARIBAUD <>2014-10-26 22:23:40 +0100
commitb81fa615df129f29d343abb382392ca4ef17bdc6 (patch)
tree6745b9deec12db12db57361907598e68feec6abf /arch
parent51b17d494656c6c0db230e0a5ba9c733a96309bf (diff)
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 <>
Diffstat (limited to 'arch')
1 files changed, 1 insertions, 1 deletions
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
#endif /* CONFIG_MMU */
OpenPOWER on IntegriCloud