aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2010-02-15 16:10:57 +0900
committerPaul Mundt <lethal@linux-sh.org>2010-02-15 16:10:57 +0900
commit04c869735541c27dd137c55f35f8a18bb372bbe1 (patch)
treed4dcd62d881afcb00c587640946ebbeb3c779d37
parent028c5d5d596651bce13d06737eb3707a7e99a30c (diff)
sh: Fix up legacy PMB mode offset calculation.
The change for fixing up sh64 inadvertently inverted the logic for legacy PMB, fix that back up. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
-rw-r--r--arch/sh/kernel/vmlinux.lds.S9
1 files changed, 7 insertions, 2 deletions
diff --git a/arch/sh/kernel/vmlinux.lds.S b/arch/sh/kernel/vmlinux.lds.S
index dcf48915e2e..0e66c7b30e0 100644
--- a/arch/sh/kernel/vmlinux.lds.S
+++ b/arch/sh/kernel/vmlinux.lds.S
@@ -4,11 +4,9 @@
*/
#ifdef CONFIG_SUPERH64
#define LOAD_OFFSET PAGE_OFFSET
-#define MEMORY_OFFSET __MEMORY_START
OUTPUT_ARCH(sh:sh5)
#else
#define LOAD_OFFSET 0
-#define MEMORY_OFFSET 0
OUTPUT_ARCH(sh)
#endif
@@ -16,6 +14,13 @@ OUTPUT_ARCH(sh)
#include <asm/cache.h>
#include <asm/vmlinux.lds.h>
+#if defined(CONFIG_29BIT) || defined(CONFIG_SUPERH64) || \
+ defined(CONFIG_PMB_LEGACY)
+ #define MEMORY_OFFSET __MEMORY_START
+#else
+ #define MEMORY_OFFSET 0
+#endif
+
ENTRY(_start)
SECTIONS
{