summaryrefslogtreecommitdiff
path: root/arch/arm/mach-uniphier
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.masahiro@socionext.com>2016-03-07 20:29:41 +0900
committerMasahiro Yamada <yamada.masahiro@socionext.com>2016-03-09 01:11:15 +0900
commit5d07648662edf2b994a6433465d472a9a3e89923 (patch)
treeda9bde155a02f3973cdf2621f05c643b5486012b /arch/arm/mach-uniphier
parent1d22c4b1bdb169850736849ac100d7822512b6fb (diff)
downloadu-boot-imx-5d07648662edf2b994a6433465d472a9a3e89923.zip
u-boot-imx-5d07648662edf2b994a6433465d472a9a3e89923.tar.gz
u-boot-imx-5d07648662edf2b994a6433465d472a9a3e89923.tar.bz2
ARM: uniphier: allow debug_ll_init() to do nothing for unknown SoCs
This function should just return for unknown SoCs rather than writing unexpected values to registers. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Diffstat (limited to 'arch/arm/mach-uniphier')
-rw-r--r--arch/arm/mach-uniphier/arm32/debug_ll.S1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-uniphier/arm32/debug_ll.S b/arch/arm/mach-uniphier/arm32/debug_ll.S
index a70954c..8e4943c 100644
--- a/arch/arm/mach-uniphier/arm32/debug_ll.S
+++ b/arch/arm/mach-uniphier/arm32/debug_ll.S
@@ -175,6 +175,7 @@ proxstream2_end:
b init_uart
ph1_ld6b_end:
#endif
+ mov pc, lr
init_uart:
addruart r0, r1, r2