diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2007-07-03 00:34:19 -0600 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2007-07-04 01:07:21 +0200 |
| commit | f82b3b6304b620ef7e28bfaa1ea887a2ad2fa325 (patch) | |
| tree | 1f8b2b1ba348d2a45ead921d9ae74a6b060ee3ba /lib_ppc | |
| parent | e1a6144c32dc7de73bcdd33995de0148cbd0bd28 (diff) | |
| download | talos-obmc-uboot-f82b3b6304b620ef7e28bfaa1ea887a2ad2fa325.tar.gz talos-obmc-uboot-f82b3b6304b620ef7e28bfaa1ea887a2ad2fa325.zip | |
Don't set gd->reloc_off if relocation of .fixup works correctly
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Diffstat (limited to 'lib_ppc')
| -rw-r--r-- | lib_ppc/board.c | 5 |
1 files changed, 5 insertions, 0 deletions
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(); |
