aboutsummaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2021-11-29 12:00:57 -0500
committerTom Rini <trini@konsulko.com>2021-11-29 12:00:57 -0500
commit2402c93130c09b881f9cc1369459fb49d9fa0f74 (patch)
treeb98fcb4632c62e8693d8ee1acfa3af55c52f634a /common
parentc087b5ad974441d1408c028eb7087d86b6d127e9 (diff)
parentade37460a944aed36ae6ee634c4d4a9a22690461 (diff)
downloadu-boot-2402c93130c09b881f9cc1369459fb49d9fa0f74.zip
u-boot-2402c93130c09b881f9cc1369459fb49d9fa0f74.tar.gz
u-boot-2402c93130c09b881f9cc1369459fb49d9fa0f74.tar.bz2
Merge tag 'v2022.01-rc3' into next
Prepare v2022.01-rc3 Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'common')
-rw-r--r--common/board_f.c34
1 files changed, 18 insertions, 16 deletions
diff --git a/common/board_f.c b/common/board_f.c
index 3dc0eaa..f7ea7c7 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;
}