Merge remote-tracking branch 'u-boot-ti/master'

[platform/kernel/u-boot.git] / arch / blackfin / lib / board.c

diff --git a/arch/blackfin/lib/board.c b/arch/blackfin/lib/board.c
index 6a9282c..9fbbea0 100644 (file)
--- a/arch/blackfin/lib/board.c
+++ b/arch/blackfin/lib/board.c
@@ -78,7 +78,7 @@ static void display_global_data(void)
        printf(" gd: %p\n", gd);
        printf(" |-flags: %lx\n", gd->flags);
        printf(" |-board_type: %lx\n", gd->board_type);
-       printf(" |-baudrate: %lu\n", gd->baudrate);
+       printf(" |-baudrate: %u\n", gd->baudrate);
        printf(" |-have_console: %lx\n", gd->have_console);
        printf(" |-ram_size: %lx\n", gd->ram_size);
        printf(" |-env_addr: %lx\n", gd->env_addr);
@@ -284,9 +284,7 @@ void board_init_f(ulong bootflag)
        init_baudrate();
        serial_early_puts("Serial init\n");
        serial_init();
-#ifdef CONFIG_SERIAL_MULTI
        serial_initialize();
-#endif
        serial_early_puts("Console init flash\n");
        console_init_f();
        serial_early_puts("End of early debugging\n");