Skip to contentSkip to conversation

m68k/lib: fix serial driver relocation

PATCH New Angelo Dureghello 3 participants 3 messages Nov 23, 2012 – Jan 11, 2013 m68k architecture

lore
Share & tools
lore

Angelo Dureghello

author
#0 lore raw

PATCH 1/1 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 <[email protected]>
Cc Jason Jin <[email protected]>

---

arch/m68k/lib/board.c +2 -2
index 02d73fd..373570c 100644
@@ -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)
#1 lore raw

PATCH 1/1 m68k/lib: fix serial driver relocation

Am 2012-11-23 23:23, schrieb Angelo Dureghello:

Quoted 20 lines

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 <[email protected]>
Cc Jason Jin <[email protected]>

---

arch/m68k/lib/board.c +0 -2
index 02d73fd..373570c 100644
@@ -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);

arch/m68k/lib/board.c void board_init_r (gd_t *id, ulong dest_addr) · line 415

Quoted 10 lines
arch/m68k/lib/board.c +2 -0
 
        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)
Acked-by Jens Scharsig (BuS Elektronik) <[email protected]>
Tested-by Jens Scharsig (BuS Elektronik) <[email protected]>
#2 lore raw

PATCH 1/1 m68k/lib: fix serial driver relocation

Quoted 29 lines · Jens Scharsig

Am 2012-11-23 23:23, schrieb Angelo Dureghello:

Quoted 28 lines

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 <[email protected]>
Cc Jason Jin <[email protected]>

---

arch/m68k/lib/board.c +2 -2
index 02d73fd..373570c 100644
@@ -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;
Quoted 5 lines

arch/m68k/lib/board.c void board_init_r (gd_t *id, ulong dest_addr) · line 415

Quoted 2 lines
arch/m68k/lib/board.c +0 -0
 #if defined(CONFIG_NEEDS_MANUAL_RELOC)
Acked-by Jens Scharsig (BuS Elektronik) <[email protected]>
Tested-by Jens Scharsig (BuS Elektronik) <[email protected]>

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20130111/4ff958be/attachment.pgp>