aboutsummaryrefslogtreecommitdiff
path: root/arch/i386/lib/board.c
diff options
context:
space:
mode:
authorGraeme Russ <graeme.russ@gmail.com>2011-02-12 15:12:08 +1100
committerGraeme Russ <graeme.russ@gmail.com>2011-02-12 15:12:08 +1100
commita3824142e764c2d85a6bda54c726f8bb07b28935 (patch)
treeaef27c87ef2c6a91e336122a7c6fc972e574cd05 /arch/i386/lib/board.c
parent71a5404974602109e49796c98be5ca073c818e46 (diff)
downloadu-boot-linaro-stable-a3824142e764c2d85a6bda54c726f8bb07b28935.tar.gz
x86: Rearrange function calls in board_init_f
Diffstat (limited to 'arch/i386/lib/board.c')
-rw-r--r--arch/i386/lib/board.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/arch/i386/lib/board.c b/arch/i386/lib/board.c
index c13efc83f..b33dd4278 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();