From 3766bb33a52217a5921c4a0a65a7281859d15bce Mon Sep 17 00:00:00 2001
From: Graeme Russ <graeme.russ@gmail.com>
Date: Sun, 1 Jan 2012 15:49:43 +1100
Subject: [PATCH] x86: Set GD_FLG_RELOC after entering in-RAM copy of U-Boot
--
Changes for v2:
- None
---
arch/x86/lib/board.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/x86/lib/board.c b/arch/x86/lib/board.c
index b64c2d3ca38..3d82165af30 100644
--- a/arch/x86/lib/board.c
+++ b/arch/x86/lib/board.c
@@ -252,8 +252,6 @@ void board_init_f(ulong boot_flags)
hang();
}
- gd->flags |= GD_FLG_RELOC;
-
/*
* SDRAM is now initialised, U-Boot has been copied into SDRAM,
* the BSS has been cleared etc. The final stack can now be setup
@@ -322,6 +320,8 @@ void board_init_r(gd_t *id, ulong dest_addr)
/* compiler optimization barrier needed for GCC >= 3.4 */
__asm__ __volatile__("" : : : "memory");
+ gd->flags |= GD_FLG_RELOC;
+
gd->bd = &bd_data;
memset(gd->bd, 0, sizeof(bd_t));
show_boot_progress(0x22);
--
GitLab