]> git.sur5r.net Git - u-boot/commitdiff
mips: serial: Fix busted manual relocation
authorJoe Hershberger <joe.hershberger@ni.com>
Tue, 11 Dec 2012 17:52:50 +0000 (17:52 +0000)
committerDaniel Schwierzeck <daniel.schwierzeck@gmail.com>
Wed, 12 Dec 2012 12:20:24 +0000 (13:20 +0100)
serial_initialize() must be called after relocation to adjust the
pointers to putc(), getc(), etc.  This is busted ever since the
serial driver-model-ification series.

Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
arch/mips/lib/board.c

index 4f330ccf7d7dabcbd9f2fad5e61838a6a6be17a9..d79e1837d9a37c21c07556618a22dc9c60e173e7 100644 (file)
@@ -24,6 +24,7 @@
 #include <common.h>
 #include <command.h>
 #include <malloc.h>
+#include <serial.h>
 #include <stdio_dev.h>
 #include <version.h>
 #include <net.h>
@@ -262,6 +263,8 @@ void board_init_r(gd_t *id, ulong dest_addr)
 
        monitor_flash_len = (ulong)&uboot_end_data - dest_addr;
 
+       serial_initialize();
+
 #if defined(CONFIG_NEEDS_MANUAL_RELOC)
        /*
         * We have to relocate the command table manually