FRV: permit the memory to be located elsewhere in NOMMU mode

Permit the memory to be located somewhere other than address 0xC0000000 in
NOMMU mode.  The configuration options are already present, it just
requires wiring up in the linker script.

Note that only a limited set of locations of runtime addresses are available
because of the way the CPU protection registers work.

Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

2 files changed, 10 insertions, 1 deletions

diff --git a/arch/frv/Kconfig b/arch/frv/Kconfig
index bf0468cbe713..96f7d70f4473 100644
--- a/arch/frv/Kconfig
+++ b/arch/frv/Kconfig
@@ -138,6 +138,15 @@ config UCPAGE_OFFSET_C0000000
 
 endchoice
 
+config PAGE_OFFSET
+        hex
+        default 0x20000000 if UCPAGE_OFFSET_20000000
+        default 0x40000000 if UCPAGE_OFFSET_40000000
+        default 0x60000000 if UCPAGE_OFFSET_60000000
+        default 0x80000000 if UCPAGE_OFFSET_80000000
+        default 0xA0000000 if UCPAGE_OFFSET_A0000000
+        default 0xC0000000
+
 config PROTECT_KERNEL
         bool "Protect core kernel against userspace"
         depends on !MMU
diff --git a/arch/frv/kernel/vmlinux.lds.S b/arch/frv/kernel/vmlinux.lds.S
index f42b328b1dd0..ef7527b8b0c7 100644
--- a/arch/frv/kernel/vmlinux.lds.S
+++ b/arch/frv/kernel/vmlinux.lds.S
@@ -13,7 +13,7 @@ ENTRY(_start)
 
 jiffies = jiffies_64 + 4;
 
-__page_offset = 0xc0000000;             /* start of area covered by struct pages */
+__page_offset = CONFIG_PAGE_OFFSET;     /* start of area covered by struct pages */
 __kernel_image_start = __page_offset;   /* address at which kernel image resides */
 
 SECTIONS