From: David Müller (ELSOFT AG) <d.mueller@elsoft.ch>
Date: Tue, 9 Feb 2016 15:48:28 +0000 (+0100)
Subject: arm: make sure board_init_r() is being called using the right mode (ARM / THUMB)
X-Git-Tag: v2016.03-rc2~20
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=03a3a8aec85780f034c9c8fca4a12abfeb9b4da7;p=oweals%2Fu-boot.git

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>
---

diff --git a/arch/arm/lib/crt0.S b/arch/arm/lib/crt0.S
index 2f4c14e96b..8415f77e1b 100644
--- a/arch/arm/lib/crt0.S
+++ b/arch/arm/lib/crt0.S
@@ -167,8 +167,12 @@ clbss_l:cmp	r0, r1			/* while not at end of BSS */
 	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