From: Grant Likely <grant.likely@secretlab.ca>
Date: Tue, 3 Jul 2007 06:34:19 +0000 (-0600)
Subject: Don't set gd->reloc_off if relocation of .fixup works correctly
X-Git-Tag: v1.3.0-rc1~19^2~20^2~18^2~114
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=f82b3b6304b620ef7e28bfaa1ea887a2ad2fa325;p=u-boot

Don't set gd->reloc_off if relocation of .fixup works correctly

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
---

diff --git a/lib_ppc/board.c b/lib_ppc/board.c
index 310c1de3fe..8bb885d4c9 100644
--- a/lib_ppc/board.c
+++ b/lib_ppc/board.c
@@ -620,7 +620,12 @@ void board_init_r (gd_t *id, ulong dest_addr)
 	bd = gd->bd;
 
 	gd->flags |= GD_FLG_RELOC;	/* tell others: relocation done */
+
+#if defined(CONFIG_RELOC_FIXUP_WORKS)
+	gd->reloc_off = 0;
+#else
 	gd->reloc_off = dest_addr - CFG_MONITOR_BASE;
+#endif
 
 #ifdef CONFIG_SERIAL_MULTI
 	serial_initialize();