On Wed, Feb 26, 2014 at 02:46:05PM +0100, Uwe Kleine-König wrote: > diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig > --- a/arch/arm/Kconfig > +++ b/arch/arm/Kconfig > @@ -1595,6 +1595,7 @@ endchoice > > config PAGE_OFFSET > hex > + default DRAM_BASE if !MMU > default 0x40000000 if VMSPLIT_1G > default 0x80000000 if VMSPLIT_2G > default 0xC0000000 I'd prefer this actually: diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 24d65aae0491..09289d7b7f68 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1593,6 +1593,7 @@ config BL_SWITCHER_DUMMY_IF choice prompt "Memory split" + depends on MMU default VMSPLIT_3G help Select the desired split between kernel and user memory. @@ -1610,6 +1611,7 @@ endchoice config PAGE_OFFSET hex + default PHYS_OFFSET if !MMU default 0x40000000 if VMSPLIT_1G default 0x80000000 if VMSPLIT_2G default 0xC0000000 diff --git a/arch/arm/include/asm/memory.h b/arch/arm/include/asm/memory.h index 8756e4bcdba0..5ccc4a627192 100644 --- a/arch/arm/include/asm/memory.h +++ b/arch/arm/include/asm/memory.h @@ -104,10 +104,6 @@ #define END_MEM (UL(CONFIG_DRAM_BASE) + CONFIG_DRAM_SIZE) #endif -#ifndef PAGE_OFFSET -#define PAGE_OFFSET PLAT_PHYS_OFFSET -#endif - /* * The module can be at any place in ram in nommu mode. */ It's more to the point. The first hunk hides the "Memory split" option which is irrelevent on !MMU. We already know that PAGE_OFFSET should be the same as PHYS_OFFSET for noMMU, so let's make that explicit. Note that it already is by way of the bit in the last hunk - which as a result of this change can now be removed... especially so as we have nothing defining PAGE_OFFSET in arch/arm/*/include... -- FTTC broadband for 0.8mile line: now at 9.7Mbps down 460kbps up... slowly improving, and getting towards what was expected from it. -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html