From: Graeme Russ <graeme.russ@gmail.com>
Date: Sat, 12 Feb 2011 04:12:08 +0000 (+1100)
Subject: x86: Rearrange function calls in board_init_f
X-Git-Tag: v2011.03-rc2~64
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=a3824142e764c2d85a6bda54c726f8bb07b28935;p=u-boot

x86: Rearrange function calls in board_init_f
---

diff --git a/arch/i386/lib/board.c b/arch/i386/lib/board.c
index c13efc83f9..b33dd4278e 100644
--- a/arch/i386/lib/board.c
+++ b/arch/i386/lib/board.c
@@ -235,6 +235,14 @@ static int do_elf_reloc_fixups(void)
  */
 void board_init_f(ulong boot_flags)
 {
+	/* First stage CPU initialization */
+	if (cpu_init_f() != 0)
+		hang();
+
+	/* First stage Board initialization */
+	if (board_early_init_f() != 0)
+		hang();
+
 	if (env_init() != 0)
 		hang();
 
@@ -253,14 +261,6 @@ void board_init_f(ulong boot_flags)
 	if (calculate_relocation_address() != 0)
 		hang();
 
-	/* First stage CPU initialization */
-	if (cpu_init_f() != 0)
-		hang();
-
-	/* First stage Board initialization */
-	if (board_early_init_f() != 0)
-		hang();
-
 	/* Copy U-Boot into RAM */
 	if (copy_uboot_to_ram() != 0)
 		hang();