aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorangelo <sysamfw@gmail.com>2012-11-23 12:23:39 +0000
committerTom Rini <trini@ti.com>2013-01-11 14:41:14 -0700
commitfd70aa41468be4324275910f85578cb5be6a0439 (patch)
tree8dd92fa1d3c8b2d78486a992964f6a1b6da30a01
parent7a8e739cd5bc0c48511d343f469af89a88a3294d (diff)
downloadu-boot-linaro-stable-fd70aa41468be4324275910f85578cb5be6a0439.tar.gz
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>
-rw-r--r--arch/m68k/lib/board.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/m68k/lib/board.c b/arch/m68k/lib/board.c
index 794b8679f..e934cb6c2 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)