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

[karo-tx-linux.git] / arch / arm / Kconfig

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index ede2526ecf1f1046254492351ff5618f0987dcda..41cbb4a53066b240ad1b2a8c9b5e312eb3c19164 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -268,7 +268,6 @@ config PHYS_OFFSET
        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 || \
@@ -277,10 +276,7 @@ config 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
+       default 0xc0000000 if ARCH_SA1100
        help
          Please provide the physical address corresponding to the
          location of main memory in your system.
@@ -418,11 +414,14 @@ config ARCH_EP93XX
        bool "EP93xx-based"
        select ARCH_HAS_HOLES_MEMORYMODEL
        select ARCH_REQUIRE_GPIOLIB
-       select ARCH_USES_GETTIMEOFFSET
        select ARM_AMBA
+       select ARM_PATCH_PHYS_VIRT
        select ARM_VIC
+       select AUTO_ZRELADDR
        select CLKDEV_LOOKUP
+       select CLKSRC_MMIO
        select CPU_ARM920T
+       select GENERIC_CLOCKEVENTS
        help
          This enables support for the Cirrus EP93xx series of CPUs.