Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm

[mirror_ubuntu-zesty-kernel.git] / arch / arm / Kconfig

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 88acf8bc1490a6cc150029f82e8965db80970257..1e14b9068a390447967960f0d0b95606951e5ba9 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -263,8 +263,22 @@ config NEED_MACH_MEMORY_H
 
 config PHYS_OFFSET
        hex "Physical address of main memory" if MMU
-       depends on !ARM_PATCH_PHYS_VIRT && !NEED_MACH_MEMORY_H
+       depends on !ARM_PATCH_PHYS_VIRT
        default DRAM_BASE if !MMU
+       default 0x00000000 if ARCH_EBSA110 || \
+                       EP93XX_SDCE3_SYNC_PHYS_OFFSET || \
+                       ARCH_FOOTBRIDGE || \
+                       ARCH_INTEGRATOR || \
+                       ARCH_IOP13XX || \
+                       ARCH_KS8695 || \
+                       (ARCH_REALVIEW && !REALVIEW_HIGH_PHYS_OFFSET)
+       default 0x10000000 if ARCH_OMAP1 || ARCH_RPC
+       default 0x20000000 if ARCH_S5PV210
+       default 0x70000000 if REALVIEW_HIGH_PHYS_OFFSET
+       default 0xc0000000 if EP93XX_SDCE0_PHYS_OFFSET || ARCH_SA1100
+       default 0xd0000000 if EP93XX_SDCE1_PHYS_OFFSET
+       default 0xe0000000 if EP93XX_SDCE2_PHYS_OFFSET
+       default 0xf0000000 if EP93XX_SDCE3_ASYNC_PHYS_OFFSET
        help
          Please provide the physical address corresponding to the
          location of main memory in your system.
@@ -313,7 +327,7 @@ config ARCH_MULTIPLATFORM
 config ARCH_INTEGRATOR
        bool "ARM Ltd. Integrator family"
        select ARM_AMBA
-       select ARM_PATCH_PHYS_VIRT
+       select ARM_PATCH_PHYS_VIRT if MMU
        select AUTO_ZRELADDR
        select COMMON_CLK
        select COMMON_CLK_VERSATILE
@@ -436,7 +450,6 @@ config ARCH_EP93XX
        select ARM_VIC
        select CLKDEV_LOOKUP
        select CPU_ARM920T
-       select NEED_MACH_MEMORY_H
        help
          This enables support for the Cirrus EP93xx series of CPUs.
 
@@ -659,7 +672,7 @@ config ARCH_MSM
 config ARCH_SHMOBILE_LEGACY
        bool "Renesas ARM SoCs (non-multiplatform)"
        select ARCH_SHMOBILE
-       select ARM_PATCH_PHYS_VIRT
+       select ARM_PATCH_PHYS_VIRT if MMU
        select CLKDEV_LOOKUP
        select GENERIC_CLOCKEVENTS
        select HAVE_ARM_SCU if SMP