Browse Source

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

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Grant Likely 18 years ago
parent
commit
f82b3b6304
1 changed files with 5 additions and 0 deletions
  1. 5 0
      lib_ppc/board.c

+ 5 - 0
lib_ppc/board.c

@@ -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();