diff options
author | Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com> | 2010-02-15 03:37:50 -0500 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2010-02-15 23:50:26 -0500 |
commit | 319c2cc761505ee54a9536c5d0b9c2ee3fb33866 (patch) | |
tree | 88cc4d3e9ed697c5bdc8383712f9d3f5735e38ef /arch/sh | |
parent | fb1e776050f0f6a7b90eba03a1d001756454f9dc (diff) |
sh: Fix zImage boot using fixed PMB.
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com>
Signed-off-by: Yoshihiro Shimoda <shimoda.yoshihiro@renesas.com>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh')
-rw-r--r-- | arch/sh/boot/compressed/misc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/boot/compressed/misc.c b/arch/sh/boot/compressed/misc.c index d509a5050623..9ba07927d16a 100644 --- a/arch/sh/boot/compressed/misc.c +++ b/arch/sh/boot/compressed/misc.c | |||
@@ -117,7 +117,7 @@ void decompress_kernel(void) | |||
117 | output_addr = (CONFIG_MEMORY_START + 0x2000); | 117 | output_addr = (CONFIG_MEMORY_START + 0x2000); |
118 | #else | 118 | #else |
119 | output_addr = __pa((unsigned long)&_text+PAGE_SIZE); | 119 | output_addr = __pa((unsigned long)&_text+PAGE_SIZE); |
120 | #ifdef CONFIG_29BIT | 120 | #if defined(CONFIG_29BIT) || defined(CONFIG_PMB_LEGACY) |
121 | output_addr |= P2SEG; | 121 | output_addr |= P2SEG; |
122 | #endif | 122 | #endif |
123 | #endif | 123 | #endif |