From: Lothar Waßmann <LW@KARO-electronics.de>
Date: Thu, 16 Jul 2015 11:29:09 +0000 (+0200)
Subject: common/board_f.c: fix condition for reloc_off assignment
X-Git-Tag: KARO-TX6-2015-09-18~4034^2~1^2~21
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-uboot.git;a=commitdiff_plain;h=5adfb00f7abda1dade1e43238bfcab978f6075ad

common/board_f.c: fix condition for reloc_off assignment

All ARM systems define the symbol __image_copy_start which is the
correct relocation base address for secure and non-secure boot.
---

diff --git a/common/board_f.c b/common/board_f.c
index 8e8e2177a1..c172ea1acb 100644
--- a/common/board_f.c
+++ b/common/board_f.c
@@ -739,7 +739,7 @@ static int reloc_fdt(void)
 static int setup_reloc(void)
 {
 #ifdef CONFIG_SYS_TEXT_BASE
-#ifndef CONFIG_SECURE_BOOT
+#ifndef CONFIG_ARM
 	gd->reloc_off = gd->relocaddr - CONFIG_SYS_TEXT_BASE;
 #else
 	gd->reloc_off = gd->relocaddr - (unsigned long)__image_copy_start;