arm: rcar_gen3: Add skip of relocation

Signed-off-by: Hiroyuki Yokoyama <hiroyuki.yokoyama.vx@renesas.com>
renesas-rcar · Sep 3, 2015 · 86ad309 · 86ad309
1 parent 4a569c8
commit 86ad309
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/arch/arm/lib/crt0_64.S b/arch/arm/lib/crt0_64.S
@@ -87,13 +87,15 @@ zero_gd:
 	ldr	x18, [x18, #GD_BD]		/* x18 <- gd->bd */
 	sub	x18, x18, #GD_SIZE		/* new GD is below bd */
 
+#ifndef CONFIG_RCAR_GEN3
 	adr	lr, relocation_return
 	ldr	x9, [x18, #GD_RELOC_OFF]	/* x9 <- gd->reloc_off */
 	add	lr, lr, x9	/* new return address after relocation */
 	ldr	x0, [x18, #GD_RELOCADDR]	/* x0 <- gd->relocaddr */
 	b	relocate_code
 
 relocation_return:
+#endif
 
 /*
  * Set up final (full) environment