diff options
| author | Nobuhiro Iwamatsu <iwamatsu@nigauri.org> | 2010-03-20 16:42:54 +0900 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-04-01 15:58:55 -0700 |
| commit | f15a9d8a07f97af708304414910e7daeb5e5936d (patch) | |
| tree | bfa7cf937e51bede30ccb57a115ac91e94358b42 /arch | |
| parent | fc4da4ab6ea18f1f5073c2af98d554cd69f632e8 (diff) | |
sh: Fix zImage boot using fixed PMB.
commit 319c2cc761505ee54a9536c5d0b9c2ee3fb33866 upstream.
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'arch')
| -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 fd56a71ca9d..974ba71df4a 100644 --- a/arch/sh/boot/compressed/misc.c +++ b/arch/sh/boot/compressed/misc.c @@ -132,7 +132,7 @@ void decompress_kernel(void) output_addr = (CONFIG_MEMORY_START + 0x2000); #else output_addr = PHYSADDR((unsigned long)&_text+PAGE_SIZE); -#ifdef CONFIG_29BIT +#if defined(CONFIG_29BIT) || defined(CONFIG_PMB_FIXED) output_addr |= P2SEG; #endif #endif |