aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoe Hershberger <joe.hershberger@ni.com>2012-12-11 17:52:50 +0000
committerDaniel Schwierzeck <daniel.schwierzeck@gmail.com>2012-12-12 13:20:24 +0100
commitf88e09de8d4ce7307c6aaf3a3adff53e85b4b5b3 (patch)
tree2a7a9e52d1db778db2a305098377d743d7cac1e7
parentf0c27993e42e801b1bd0c168809ccdbc5e05f9f3 (diff)
downloadu-boot-linaro-stable-f88e09de8d4ce7307c6aaf3a3adff53e85b4b5b3.tar.gz
mips: serial: Fix busted manual relocation
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>
-rw-r--r--arch/mips/lib/board.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/mips/lib/board.c b/arch/mips/lib/board.c
index 4f330ccf7..d79e1837d 100644
--- a/arch/mips/lib/board.c
+++ b/arch/mips/lib/board.c
@@ -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