diff options
| author | Graeme Russ <graeme.russ@gmail.com> | 2011-02-12 15:12:03 +1100 |
|---|---|---|
| committer | Graeme Russ <graeme.russ@gmail.com> | 2011-02-12 15:12:03 +1100 |
| commit | 0b2378557c66f97449fe899d51171819599cfc1b (patch) | |
| tree | 3649d99295d43b20b1a867cd7e3d5f20a19cef68 | |
| parent | bf6af154a48a19d29c17cd35dd78a61bc045026f (diff) | |
x86: Move console initialisation into board_init_f
| -rw-r--r-- | arch/i386/lib/board.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/arch/i386/lib/board.c b/arch/i386/lib/board.c index 1fd422f2f..32f013aef 100644 --- a/arch/i386/lib/board.c +++ b/arch/i386/lib/board.c @@ -162,9 +162,6 @@ init_fnc_t *init_sequence[] = { dram_init, /* configure available RAM banks */ interrupt_init, /* set up exceptions */ timer_init, - env_init, /* initialize environment */ - init_baudrate, /* initialze baudrate settings */ - serial_init, /* serial communications setup */ display_banner, display_dram_config, @@ -197,6 +194,18 @@ void board_init_f(ulong boot_flags) gd->flags = boot_flags; + if (env_init() != 0) + hang(); + + if (init_baudrate() != 0) + hang(); + + if (serial_init() != 0) + hang(); + + if (console_init_f() != 0) + hang(); + if (dram_init_f() != 0) hang(); |