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

[linux-2.6-microblaze.git] / arch / arm / Kconfig

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 6900aab..a208bfe 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -22,9 +22,11 @@ config ARM
        select CLONE_BACKWARDS
        select CPU_PM if (SUSPEND || CPU_IDLE)
        select DCACHE_WORD_ACCESS if HAVE_EFFICIENT_UNALIGNED_ACCESS
+       select DMA_NOOP_OPS if !MMU
        select EDAC_SUPPORT
        select EDAC_ATOMIC_SCRUB
        select GENERIC_ALLOCATOR
+       select GENERIC_ARCH_TOPOLOGY if ARM_CPU_TOPOLOGY
        select GENERIC_ATOMIC64 if (CPU_V7M || CPU_V6 || !CPU_32v6K || !AEABI)
        select GENERIC_CLOCKEVENTS_BROADCAST if SMP
        select GENERIC_CPU_AUTOPROBE
@@ -338,7 +340,7 @@ config ARCH_MULTIPLATFORM
        select ARM_HAS_SG_CHAIN
        select ARM_PATCH_PHYS_VIRT
        select AUTO_ZRELADDR
-       select CLKSRC_OF
+       select TIMER_OF
        select COMMON_CLK
        select GENERIC_CLOCKEVENTS
        select MIGHT_HAVE_PCI
@@ -352,7 +354,7 @@ config ARM_SINGLE_ARMV7M
        depends on !MMU
        select ARM_NVIC
        select AUTO_ZRELADDR
-       select CLKSRC_OF
+       select TIMER_OF
        select COMMON_CLK
        select CPU_V7M
        select GENERIC_CLOCKEVENTS
@@ -533,7 +535,7 @@ config ARCH_PXA
        select CLKDEV_LOOKUP
        select CLKSRC_PXA
        select CLKSRC_MMIO
-       select CLKSRC_OF
+       select TIMER_OF
        select CPU_XSCALE if !CPU_XSC3
        select GENERIC_CLOCKEVENTS
        select GPIO_PXA
@@ -572,7 +574,7 @@ config ARCH_SA1100
        select CLKDEV_LOOKUP
        select CLKSRC_MMIO
        select CLKSRC_PXA
-       select CLKSRC_OF if OF
+       select TIMER_OF if OF
        select CPU_FREQ
        select CPU_SA1100
        select GENERIC_CLOCKEVENTS
@@ -712,6 +714,8 @@ config ARCH_VIRT
 #
 source "arch/arm/mach-mvebu/Kconfig"
 
+source "arch/arm/mach-actions/Kconfig"
+
 source "arch/arm/mach-alpine/Kconfig"
 
 source "arch/arm/mach-artpec/Kconfig"
@@ -1358,7 +1362,7 @@ config HAVE_ARM_ARCH_TIMER
 
 config HAVE_ARM_TWD
        bool
-       select CLKSRC_OF if OF
+       select TIMER_OF if OF
        help
          This options enables support for the ARM timer and watchdog unit
 
@@ -1462,6 +1466,7 @@ config ARM_PSCI
 # selected platforms.
 config ARCH_NR_GPIO
        int
+       default 2048 if ARCH_SOCFPGA
        default 1024 if ARCH_BRCMSTB || ARCH_SHMOBILE || ARCH_TEGRA || \
                ARCH_ZYNQ
        default 512 if ARCH_EXYNOS || ARCH_KEYSTONE || SOC_OMAP5 || \
@@ -1639,7 +1644,7 @@ config ARCH_SELECT_MEMORY_MODEL
 config HAVE_ARCH_PFN_VALID
        def_bool ARCH_HAS_HOLES_MEMORYMODEL || !SPARSEMEM
 
-config HAVE_GENERIC_RCU_GUP
+config HAVE_GENERIC_GUP
        def_bool y
        depends on ARM_LPAE
 
@@ -2063,6 +2068,23 @@ config EFI
          is only useful for kernels that may run on systems that have
          UEFI firmware.
 
+config DMI
+       bool "Enable support for SMBIOS (DMI) tables"
+       depends on EFI
+       default y
+       help
+         This enables SMBIOS/DMI feature for systems.
+
+         This option is only useful on systems that have UEFI firmware.
+         However, even with this option, the resultant kernel should
+         continue to boot on existing non-UEFI platforms.
+
+         NOTE: This does *NOT* enable or encourage the use of DMI quirks,
+         i.e., the the practice of identifying the platform via DMI to
+         decide whether certain workarounds for buggy hardware and/or
+         firmware need to be enabled. This would require the DMI subsystem
+         to be enabled much earlier than we do on ARM, which is non-trivial.
+
 endmenu
 
 menu "CPU Power Management"