From: angelo <sysamfw@gmail.com>
Date: Fri, 23 Nov 2012 12:23:39 +0000 (+0000)
Subject: m68k/lib: fix serial driver relocation
X-Git-Tag: v2013.01~8
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=fd70aa41468be4324275910f85578cb5be6a0439;p=oweals%2Fu-boot.git

m68k/lib: fix serial driver relocation

Fix coldfire serial driver bindings no more relocated to ram after last
changes to drivers/serial/serial.c (regression).
Serial initialization in ram has to be called after that gd->reloc_off is
calculated.

Signed-off-by: Angelo Dureghello <sysamfw@gmail.com>
Cc: Jason Jin <jason.jin@freescale.com>
Acked-by: Jens Scharsig (BuS Elektronik) <esw@bus-elektronik.de>
Tested-by: Jens Scharsig (BuS Elektronik) <esw@bus-elektronik.de>
---

diff --git a/arch/m68k/lib/board.c b/arch/m68k/lib/board.c
index 794b8679fe..e934cb6c25 100644
--- a/arch/m68k/lib/board.c
+++ b/arch/m68k/lib/board.c
@@ -402,14 +402,14 @@ void board_init_r (gd_t *id, ulong dest_addr)
 
 	gd->flags |= GD_FLG_RELOC;	/* tell others: relocation done */
 
-	serial_initialize();
-
 	debug ("Now running in RAM - U-Boot at: %08lx\n", dest_addr);
 
 	WATCHDOG_RESET ();
 
 	gd->reloc_off =  dest_addr - CONFIG_SYS_MONITOR_BASE;
 
+	serial_initialize();
+
 	monitor_flash_len = (ulong)&__init_end - dest_addr;
 
 #if defined(CONFIG_NEEDS_MANUAL_RELOC)