sh: Fix zImage boot using fixed PMB.
authorNobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com>
Mon, 15 Feb 2010 08:37:50 +0000 (08:37 +0000)
committerPaul Mundt <lethal@linux-sh.org>
Tue, 16 Feb 2010 04:50:26 +0000 (13:50 +0900)
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>
arch/sh/boot/compressed/misc.c

index d509a50..9ba0792 100644 (file)
@@ -117,7 +117,7 @@ void decompress_kernel(void)
        output_addr = (CONFIG_MEMORY_START + 0x2000);
 #else
        output_addr = __pa((unsigned long)&_text+PAGE_SIZE);
-#ifdef CONFIG_29BIT
+#if defined(CONFIG_29BIT) || defined(CONFIG_PMB_LEGACY)
        output_addr |= P2SEG;
 #endif
 #endif