From 03a3a8aec85780f034c9c8fca4a12abfeb9b4da7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?David=20M=C3=BCller=20=28ELSOFT=20AG=29?= Date: Tue, 9 Feb 2016 16:48:28 +0100 Subject: [PATCH] arm: make sure board_init_r() is being called using the right mode (ARM / THUMB) MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: David Müller --- arch/arm/lib/crt0.S | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 -- 2.39.5