commit 03a3a8aec85780f034c9c8fca4a12abfeb9b4da7
author David Müller (ELSOFT AG) <d.mueller@elsoft.ch> Tue Feb 09 16:48:28 2016 +0100
committer Tom Rini <trini@konsulko.com> Mon Feb 15 12:04:45 2016 -0500
tree e630b066143b3ec55ec68b0bc68f8100867aee62
parent 7101c4ce8d063fba676cc3fc3900b0d1734e6cae

arm: make sure board_init_r() is being called using the right mode (ARM / THUMB)

Signed-off-by: David Müller <d.mueller@elsoft.ch>

arch/arm/lib/crt0.S

diff --git a/arch/arm/lib/crt0.S b/arch/arm/lib/crt0.S
index 2f4c14e..8415f77 100644
--- a/arch/arm/lib/crt0.S
+++ b/arch/arm/lib/crt0.S
@@ -167,8 +167,12 @@
 	mov     r0, r9                  /* gd_t */
 	ldr	r1, [r9, #GD_RELOCADDR]	/* dest_addr */
 	/* call board_init_r */
+#if defined(CONFIG_SYS_THUMB_BUILD)
+	ldr	lr, =board_init_r	/* this is auto-relocated! */
+	bx	lr
+#else
 	ldr	pc, =board_init_r	/* this is auto-relocated! */
-
+#endif
 	/* we should not return here. */
 #endif