Commit 75df6449 authored by Mark A. Greer's avatar Mark A. Greer Committed by Linus Torvalds

[PATCH] ppc32: fix mv64x60 register relocation bug in bootwrapper

The gt64260 looks at the highest 20 bits while the mv64[34]60 looks at only
the highest 16 bits when determining the base address for the bridge's
registers.  This patch adds support for both.
Signed-off-by: default avatarNate Case <ncase@xes-inc.com>
Signed-off-by: default avatarMark A. Greer <mgreer@mvista.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 94307385
...@@ -32,7 +32,11 @@ mv64x60_init: ...@@ -32,7 +32,11 @@ mv64x60_init:
#if (CONFIG_MV64X60_NEW_BASE != CONFIG_MV64X60_BASE) #if (CONFIG_MV64X60_NEW_BASE != CONFIG_MV64X60_BASE)
move_base: move_base:
li r20,0 li r20,0
#ifdef CONFIG_GT64260
li r23,20 li r23,20
#else /* Must be mv64[34]60 which uses top 16 bits */
li r23,16
#endif
/* Relocate bridge's regs */ /* Relocate bridge's regs */
addis r25,0,CONFIG_MV64X60_BASE@h addis r25,0,CONFIG_MV64X60_BASE@h
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment