diff mbox

[U-Boot,29/32] x86: Rearrange function calls in board_init_f

Message ID 1296822959-3927-30-git-send-email-graeme.russ@gmail.com
State Accepted
Commit a3824142e764c2d85a6bda54c726f8bb07b28935
Delegated to: Graeme Russ
Headers show

Commit Message

Graeme Russ Feb. 4, 2011, 12:35 p.m. UTC 
Signed-off-by: Graeme Russ <graeme.russ@gmail.com>
---
 arch/i386/lib/board.c |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

Comments

Graeme Russ Feb. 12, 2011, 4:31 a.m. UTC | #1 
On 04/02/11 23:35, Graeme Russ wrote:
> Signed-off-by: Graeme Russ <graeme.russ@gmail.com>
> ---
>  arch/i386/lib/board.c |   16 ++++++++--------
>  1 files changed, 8 insertions(+), 8 deletions(-)
> 

Applied to u-boot-x86

Regards,

Graeme
diff mbox

Patch

diff --git a/arch/i386/lib/board.c b/arch/i386/lib/board.c
index 44e871b..4751e49 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();