aboutsummaryrefslogtreecommitdiff
path: root/arch/x86
diff options
context:
space:
mode:
authorGraeme Russ <graeme.russ@gmail.com>2012-01-01 15:49:43 +1100
committerGraeme Russ <graeme.russ@gmail.com>2012-01-04 22:18:36 +1100
commit3766bb33a52217a5921c4a0a65a7281859d15bce (patch)
treec8ca7d8916b1a2cb77559bad4099364b830f313f /arch/x86
parent9e6c572ff03cda84c88663b23c7157d8b1f275ac (diff)
downloadu-boot-linaro-stable-3766bb33a52217a5921c4a0a65a7281859d15bce.tar.gz
x86: Set GD_FLG_RELOC after entering in-RAM copy of U-Boot
-- Changes for v2: - None
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/lib/board.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/lib/board.c b/arch/x86/lib/board.c
index b64c2d3ca..3d82165af 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);