From: Paul Mundt <lethal@linux-sh.org>
Date: Sat, 11 Jul 2009 17:36:25 +0000 (-0400)
Subject: sh64: Don't use PHYSADDR() for output_addr calculation.
X-Git-Tag: v2.6.32-rc1~640^2~96
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=040f43e0bf70935cbe8a775110206d11367e11db;p=karo-tx-linux.git

sh64: Don't use PHYSADDR() for output_addr calculation.

Opencode the MEMORY_START offset directly, sh64 uses a slightly different
calculation.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
---

diff --git a/arch/sh/boot/compressed/misc.c b/arch/sh/boot/compressed/misc.c
index 4eb27e61f8e3..fd56a71ca9d9 100644
--- a/arch/sh/boot/compressed/misc.c
+++ b/arch/sh/boot/compressed/misc.c
@@ -128,9 +128,13 @@ void decompress_kernel(void)
 {
 	unsigned long output_addr;
 
+#ifdef CONFIG_SUPERH64
+	output_addr = (CONFIG_MEMORY_START + 0x2000);
+#else
 	output_addr = PHYSADDR((unsigned long)&_text+PAGE_SIZE);
 #ifdef CONFIG_29BIT
 	output_addr |= P2SEG;
+#endif
 #endif
 
 	output = (unsigned char *)output_addr;