diff options
| author | Marek Vasut <marek.vasut+renesas@gmail.com> | 2021-11-13 18:34:04 +0100 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-11-18 18:20:19 -0500 |
| commit | 47d7d03622ba8b52f87274c7eea917a15e76053b (patch) | |
| tree | 93929e3511037fa20c97d72fdbd569da54248e7b /common | |
| parent | 50f7b2effd4971439e9b66467e4abf6688a124d9 (diff) | |
board_f: Copy GD to new GD even if relocation disabled
Even if U-Boot has relocation disabled via GD_FLG_SKIP_RELOC , the
relocated stage of U-Boot still picks GD from new_gd location. The
U-Boot itself is not relocated, but GD might be, so copy the GD to
new GD location even if relocation is disabled.
Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Cc: Peng Fan <peng.fan@oss.nxp.com>
Cc: Simon Glass <sjg@chromium.org>
Cc: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'common')
| -rw-r--r-- | common/board_f.c | 34 |
1 files changed, 18 insertions, 16 deletions
diff --git a/common/board_f.c b/common/board_f.c index 3dc0eaa59c..f7ea7c7a1e 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -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; } |