Don't set gd->reloc_off if relocation of .fixup works correctly
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
This commit is contained in:
parent
e1a6144c32
commit
f82b3b6304
|
|
@ -620,7 +620,12 @@ void board_init_r (gd_t *id, ulong dest_addr)
|
||||||
bd = gd->bd;
|
bd = gd->bd;
|
||||||
|
|
||||||
gd->flags |= GD_FLG_RELOC; /* tell others: relocation done */
|
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;
|
gd->reloc_off = dest_addr - CFG_MONITOR_BASE;
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifdef CONFIG_SERIAL_MULTI
|
#ifdef CONFIG_SERIAL_MULTI
|
||||||
serial_initialize();
|
serial_initialize();
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue