From: Lothar Waßmann <LW@KARO-electronics.de>
Date: Tue, 16 Jun 2015 09:05:37 +0000 (+0200)
Subject: common/board_f.c: adjust reloc_offs for secure boot
X-Git-Tag: KARO-TXA5-2015-06-26~15
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-uboot.git;a=commitdiff_plain;h=65657509374433dc1a153cbe4269d1acd612908e

common/board_f.c: adjust reloc_offs for secure boot
---

diff --git a/common/board_f.c b/common/board_f.c
index 79531377a7..2a1022252c 100644
--- a/common/board_f.c
+++ b/common/board_f.c
@@ -734,7 +734,11 @@ static int reloc_fdt(void)
 static int setup_reloc(void)
 {
 #ifdef CONFIG_SYS_TEXT_BASE
+#ifndef CONFIG_SECURE_BOOT
 	gd->reloc_off = gd->relocaddr - CONFIG_SYS_TEXT_BASE;
+#else
+	gd->reloc_off = gd->relocaddr - (unsigned long)__image_copy_start;
+#endif
 #endif
 	memcpy(gd->new_gd, (char *)gd, sizeof(gd_t));