From: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
Date: Sat, 20 Mar 2010 07:42:54 +0000 (+0900)
Subject: sh: Fix zImage boot using fixed PMB.
X-Git-Tag: firefly_0821_release~10186^2~1922
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=f15a9d8a07f97af708304414910e7daeb5e5936d;p=firefly-linux-kernel-4.4.55.git

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>
---

diff --git a/arch/sh/boot/compressed/misc.c b/arch/sh/boot/compressed/misc.c
index fd56a71ca9d9..974ba71df4a8 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