From 7c8a1d7be6eeeb45d76069ba5b97fb3b91c2591f Mon Sep 17 00:00:00 2001 From: David Howells Date: Mon, 4 Feb 2008 22:29:53 -0800 Subject: [PATCH] --- yaml --- r: 83117 b: refs/heads/master c: 7038220aa511131f348018b85df172a21476fef9 h: refs/heads/master i: 83115: 33dee58cd589307c7585ee1ea90dc1922be420cb v: v3 --- [refs] | 2 +- trunk/arch/frv/Kconfig | 9 +++++++++ trunk/arch/frv/kernel/vmlinux.lds.S | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index e659f404966a..2eb029a41812 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e114e473771c848c3cfec05f0123e70f1cdbdc99 +refs/heads/master: 7038220aa511131f348018b85df172a21476fef9 diff --git a/trunk/arch/frv/Kconfig b/trunk/arch/frv/Kconfig index bf0468cbe713..96f7d70f4473 100644 --- a/trunk/arch/frv/Kconfig +++ b/trunk/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/trunk/arch/frv/kernel/vmlinux.lds.S b/trunk/arch/frv/kernel/vmlinux.lds.S index f42b328b1dd0..ef7527b8b0c7 100644 --- a/trunk/arch/frv/kernel/vmlinux.lds.S +++ b/trunk/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