summaryrefslogtreecommitdiff
path: root/arch/i386/lib
diff options
context:
space:
mode:
authorGraeme Russ <graeme.russ@gmail.com>2010-04-24 00:05:47 +1000
committerWolfgang Denk <wd@denx.de>2010-05-06 00:16:46 +0200
commitbf16500f79fdf2653a286b40bb601cb185ac4675 (patch)
tree03b6320e4eb85ec4584c27270f27bbc12b7b159f /arch/i386/lib
parent167cdad1372917bc11c636c359aad02625291fa9 (diff)
downloadu-boot-imx-bf16500f79fdf2653a286b40bb601cb185ac4675.zip
u-boot-imx-bf16500f79fdf2653a286b40bb601cb185ac4675.tar.gz
u-boot-imx-bf16500f79fdf2653a286b40bb601cb185ac4675.tar.bz2
x86: Use CONFIG_SERIAL_MULTI
Signed-off-by: Graeme Russ <graeme.russ@gmail.com>
Diffstat (limited to 'arch/i386/lib')
-rw-r--r--arch/i386/lib/board.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/i386/lib/board.c b/arch/i386/lib/board.c
index 947a8ec..7115a2f 100644
--- a/arch/i386/lib/board.c
+++ b/arch/i386/lib/board.c
@@ -37,6 +37,7 @@
#include <malloc.h>
#include <net.h>
#include <ide.h>
+#include <serial.h>
#include <asm/u-boot-i386.h>
#include <elf.h>
@@ -149,7 +150,6 @@ static void display_flash_config (ulong size)
typedef int (init_fnc_t) (void);
init_fnc_t *init_sequence[] = {
- serial_init,
cpu_init_r, /* basic cpu dependent setup */
board_early_init_r, /* basic board dependent setup */
dram_init, /* configure available RAM banks */
@@ -277,6 +277,9 @@ void board_init_r(gd_t *id, ulong dest_addr)
}
show_boot_progress(0x23);
+#ifdef CONFIG_SERIAL_MULTI
+ serial_initialize();
+#endif
/* configure available FLASH banks */
size = flash_init();
display_flash_config(size);