Merge tag 'soc-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

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

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 5e54436127fccd9ee13081875ccbbe9e75bb7131..e60718b4b96d1893dab5731cc626e3405853c2be 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -65,7 +65,6 @@ config ARM
        select HAVE_UID16
        select HAVE_VIRT_CPU_ACCOUNTING_GEN
        select IRQ_FORCED_THREADING
-       select KTIME_SCALAR
        select MODULES_USE_ELF_REL
        select NO_BOOTMEM
        select OLD_SIGACTION
@@ -256,8 +255,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.
@@ -306,7 +319,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
@@ -314,7 +327,6 @@ config ARCH_INTEGRATOR
        select HAVE_TCM
        select ICST
        select MULTI_IRQ_HANDLER
-       select NEED_MACH_MEMORY_H
        select PLAT_VERSATILE
        select SPARSE_IRQ
        select USE_OF
@@ -334,7 +346,6 @@ config ARCH_REALVIEW
        select ICST
        select NEED_MACH_MEMORY_H
        select PLAT_VERSATILE
-       select PLAT_VERSATILE_CLCD
        help
          This enables support for ARM Ltd RealView boards.
 
@@ -349,7 +360,6 @@ config ARCH_VERSATILE
        select HAVE_MACH_CLKDEV
        select ICST
        select PLAT_VERSATILE
-       select PLAT_VERSATILE_CLCD
        select PLAT_VERSATILE_CLOCK
        select VERSATILE_FPGA_IRQ
        help
@@ -429,7 +439,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.
 
@@ -613,6 +622,7 @@ config ARCH_PXA
        select AUTO_ZRELADDR
        select CLKDEV_LOOKUP
        select CLKSRC_MMIO
+       select CLKSRC_OF
        select GENERIC_CLOCKEVENTS
        select GPIO_PXA
        select HAVE_IDE
@@ -637,7 +647,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