[U-Boot] [PATCH v2 08/17] x86: Set GD_FLG_RELOC after entering in-RAM copy of U-Boot

Graeme Russ graeme.russ at gmail.com
Wed Jan 4 20:59:46 CET 2012


Signed-off-by: Graeme Russ <graeme.russ at gmail.com>
---
Changes for v2:
 - None

 arch/x86/lib/board.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/x86/lib/board.c b/arch/x86/lib/board.c
index b64c2d3..3d82165 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);
--
1.7.5.2.317.g391b14



More information about the U-Boot mailing list