|
@@ -673,30 +673,32 @@ static int reloc_bloblist(void)
|
|
|
|
|
|
static int setup_reloc(void)
|
|
|
{
|
|
|
- if (gd->flags & GD_FLG_SKIP_RELOC) {
|
|
|
- debug("Skipping relocation due to flag\n");
|
|
|
- return 0;
|
|
|
- }
|
|
|
-
|
|
|
+ if (!(gd->flags & GD_FLG_SKIP_RELOC)) {
|
|
|
#ifdef CONFIG_SYS_TEXT_BASE
|
|
|
#ifdef ARM
|
|
|
- gd->reloc_off = gd->relocaddr - (unsigned long)__image_copy_start;
|
|
|
+ gd->reloc_off = gd->relocaddr - (unsigned long)__image_copy_start;
|
|
|
#elif defined(CONFIG_M68K)
|
|
|
- /*
|
|
|
- * On all ColdFire arch cpu, monitor code starts always
|
|
|
- * just after the default vector table location, so at 0x400
|
|
|
- */
|
|
|
- gd->reloc_off = gd->relocaddr - (CONFIG_SYS_TEXT_BASE + 0x400);
|
|
|
+ /*
|
|
|
+ * On all ColdFire arch cpu, monitor code starts always
|
|
|
+ * just after the default vector table location, so at 0x400
|
|
|
+ */
|
|
|
+ gd->reloc_off = gd->relocaddr - (CONFIG_SYS_TEXT_BASE + 0x400);
|
|
|
#elif !defined(CONFIG_SANDBOX)
|
|
|
- gd->reloc_off = gd->relocaddr - CONFIG_SYS_TEXT_BASE;
|
|
|
+ gd->reloc_off = gd->relocaddr - CONFIG_SYS_TEXT_BASE;
|
|
|
#endif
|
|
|
#endif
|
|
|
+ }
|
|
|
+
|
|
|
memcpy(gd->new_gd, (char *)gd, sizeof(gd_t));
|
|
|
|
|
|
- debug("Relocation Offset is: %08lx\n", gd->reloc_off);
|
|
|
- debug("Relocating to %08lx, new gd at %08lx, sp at %08lx\n",
|
|
|
- gd->relocaddr, (ulong)map_to_sysmem(gd->new_gd),
|
|
|
- gd->start_addr_sp);
|
|
|
+ if (gd->flags & GD_FLG_SKIP_RELOC) {
|
|
|
+ debug("Skipping relocation due to flag\n");
|
|
|
+ } else {
|
|
|
+ debug("Relocation Offset is: %08lx\n", gd->reloc_off);
|
|
|
+ debug("Relocating to %08lx, new gd at %08lx, sp at %08lx\n",
|
|
|
+ gd->relocaddr, (ulong)map_to_sysmem(gd->new_gd),
|
|
|
+ gd->start_addr_sp);
|
|
|
+ }
|
|
|
|
|
|
return 0;
|
|
|
}
|