From: Vincent Stehlé <v-stehle@ti.com>
Date: Fri, 15 Mar 2013 06:54:00 +0000 (+0000)
Subject: armv7: do not relocate _start twice
X-Git-Tag: v2013.04-rc2~14^2
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=d53e340edf65ff253d3a7b06ebe60501045892e3;p=oweals%2Fu-boot.git

armv7: do not relocate _start twice

The _start symbol is already relocated, so do not add the relocation the second
time in c_runtime_cpu_setup.

This fixes e.g. the abort exception handling path, which ended in double fault
due to bad address in VBAR.

Signed-off-by: Vincent Stehlé <v-stehle@ti.com>
Reported-by: Lubomir Popov <lpopov@mm-sol.com>
---

diff --git a/arch/arm/cpu/armv7/start.S b/arch/arm/cpu/armv7/start.S
index c0e184994a..36a4c3cfda 100644
--- a/arch/arm/cpu/armv7/start.S
+++ b/arch/arm/cpu/armv7/start.S
@@ -254,7 +254,6 @@ ENTRY(c_runtime_cpu_setup)
 #if !defined(CONFIG_TEGRA)
 	/* Set vector address in CP15 VBAR register */
 	ldr     r0, =_start
-	add     r0, r0, r9
 	mcr     p15, 0, r0, c12, c0, 0  @Set VBAR
 #endif /* !Tegra */