diff options
| author | Masahiro Yamada <yamada.m@jp.panasonic.com> | 2014-09-01 11:06:35 +0900 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-10-26 22:23:40 +0100 |
| commit | b81fa615df129f29d343abb382392ca4ef17bdc6 (patch) | |
| tree | 6745b9deec12db12db57361907598e68feec6abf /arch/arm | |
| parent | 51b17d494656c6c0db230e0a5ba9c733a96309bf (diff) | |
| download | u-boot-imx-b81fa615df129f29d343abb382392ca4ef17bdc6.zip u-boot-imx-b81fa615df129f29d343abb382392ca4ef17bdc6.tar.gz u-boot-imx-b81fa615df129f29d343abb382392ca4ef17bdc6.tar.bz2 | |
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>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/lib/debug.S | 2 |
1 files changed, 1 insertions, 1 deletions
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 */ |