From: Joe Hershberger <joe.hershberger@ni.com>
Date: Tue, 11 Dec 2012 17:52:50 +0000 (+0000)
Subject: mips: serial: Fix busted manual relocation
X-Git-Tag: v2013.01-rc2~29^2
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=f88e09de8d4ce7307c6aaf3a3adff53e85b4b5b3;p=oweals%2Fu-boot.git

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>
---

diff --git a/arch/mips/lib/board.c b/arch/mips/lib/board.c
index 4f330ccf7d..d79e1837d9 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