summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@secretlab.ca>2007-07-03 00:34:19 -0600
committerWolfgang Denk <wd@denx.de>2007-07-04 01:07:21 +0200
commitf82b3b6304b620ef7e28bfaa1ea887a2ad2fa325 (patch)
tree1f8b2b1ba348d2a45ead921d9ae74a6b060ee3ba
parente1a6144c32dc7de73bcdd33995de0148cbd0bd28 (diff)
downloadu-boot-imx-f82b3b6304b620ef7e28bfaa1ea887a2ad2fa325.zip
u-boot-imx-f82b3b6304b620ef7e28bfaa1ea887a2ad2fa325.tar.gz
u-boot-imx-f82b3b6304b620ef7e28bfaa1ea887a2ad2fa325.tar.bz2
Don't set gd->reloc_off if relocation of .fixup works correctly
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
-rw-r--r--lib_ppc/board.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/lib_ppc/board.c b/lib_ppc/board.c
index 310c1de..8bb885d 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();