1 files changed, 57 insertions, 12 deletions

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 1412da8ccf0..92e695412bd 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -3,7 +3,7 @@ config ARM
         default y
         select HAVE_AOUT
         select HAVE_DMA_API_DEBUG
-        select HAVE_IDE
+        select HAVE_IDE if PCI || ISA || PCMCIA
         select HAVE_MEMBLOCK
         select RTC_LIB
         select SYS_SUPPORTS_APM_EMULATION
@@ -195,7 +195,8 @@ config VECTORS_BASE
           The base address of exception vectors.
 
 config ARM_PATCH_PHYS_VIRT
-        bool "Patch physical to virtual translations at runtime"
+        bool "Patch physical to virtual translations at runtime" if EMBEDDED
+        default y
         depends on !XIP_KERNEL && MMU
         depends on !ARCH_REALVIEW || !SPARSEMEM
         help
@@ -204,16 +205,12 @@ config ARM_PATCH_PHYS_VIRT
           kernel in system memory.
 
           This can only be used with non-XIP MMU kernels where the base
-          of physical memory is at a 16MB boundary, or theoretically 64K
-          for the MSM machine class.
+          of physical memory is at a 16MB boundary.
+
+          Only disable this option if you know that you do not require
+          this feature (eg, building a kernel for a single machine) and
+          you need to shrink the kernel to the minimal size.
 
-config ARM_PATCH_PHYS_VIRT_16BIT
-        def_bool y
-        depends on ARM_PATCH_PHYS_VIRT && ARCH_MSM
-        help
-          This option extends the physical to virtual translation patching
-          to allow physical memory down to a theoretical minimum of 64K
-          boundaries.
 
 config GENERIC_BUG
         def_bool y
@@ -305,7 +302,6 @@ config ARCH_AT91
         select ARCH_REQUIRE_GPIOLIB
         select HAVE_CLK
         select CLKDEV_LOOKUP
-        select ARM_PATCH_PHYS_VIRT if MMU
         help
           This enables support for systems based on the Atmel AT91RM9200,
           AT91SAM9 and AT91CAP9 processors.
@@ -389,6 +385,7 @@ config ARCH_FOOTBRIDGE
         select CPU_SA110
         select FOOTBRIDGE
         select GENERIC_CLOCKEVENTS
+        select HAVE_IDE
         help
           Support for systems based on the DC21285 companion chip
           ("FootBridge"), such as the Simtec CATS and the Rebel NetWinder.
@@ -635,6 +632,8 @@ config ARCH_PXA
         select SPARSE_IRQ
         select AUTO_ZRELADDR
         select MULTI_IRQ_HANDLER
+        select ARM_CPU_SUSPEND if PM
+        select HAVE_IDE
         help
           Support for Intel/Marvell's PXA2xx/PXA3xx processor line.
 
@@ -675,6 +674,7 @@ config ARCH_RPC
         select NO_IOPORT
         select ARCH_SPARSEMEM_ENABLE
         select ARCH_USES_GETTIMEOFFSET
+        select HAVE_IDE
         help
           On the Acorn Risc-PC, Linux can support the internal IDE disk and
           CD-ROM interface, serial and parallel port, and the floppy drive.
@@ -693,6 +693,7 @@ config ARCH_SA1100
         select HAVE_SCHED_CLOCK
         select TICK_ONESHOT
         select ARCH_REQUIRE_GPIOLIB
+        select HAVE_IDE
         help
           Support for StrongARM 11x0 based boards.
 
@@ -1287,6 +1288,20 @@ config ARM_ERRATA_364296
           processor into full low interrupt latency mode. ARM11MPCore
           is not affected.
 
+config ARM_ERRATA_764369
+        bool "ARM errata: Data cache line maintenance operation by MVA may not succeed"
+        depends on CPU_V7 && SMP
+        help
+          This option enables the workaround for erratum 764369
+          affecting Cortex-A9 MPCore with two or more processors (all
+          current revisions). Under certain timing circumstances, a data
+          cache line maintenance operation by MVA targeting an Inner
+          Shareable memory region may fail to proceed up to either the
+          Point of Coherency or to the Point of Unification of the
+          system. This workaround adds a DSB instruction before the
+          relevant cache maintenance functions and sets a specific bit
+          in the diagnostic control register of the SCU.
+
 endmenu
 
 source "arch/arm/common/Kconfig"
@@ -1365,6 +1380,7 @@ config SMP
                  MACH_REALVIEW_PB11MP || MACH_REALVIEW_PBX || ARCH_OMAP4 || \
                  ARCH_EXYNOS4 || ARCH_TEGRA || ARCH_U8500 || ARCH_VEXPRESS_CA9X4 || \
                  ARCH_MSM_SCORPIONMP || ARCH_SHMOBILE
+        depends on MMU
         select USE_GENERIC_SMP_HELPERS
         select HAVE_ARM_SCU if !ARCH_MSM_SCORPIONMP
         help
@@ -1397,6 +1413,31 @@ config SMP_ON_UP
 
           If you don't know what to do here, say Y.
 
+config ARM_CPU_TOPOLOGY
+        bool "Support cpu topology definition"
+        depends on SMP && CPU_V7
+        default y
+        help
+          Support ARM cpu topology definition. The MPIDR register defines
+          affinity between processors which is then used to describe the cpu
+          topology of an ARM System.
+
+config SCHED_MC
+        bool "Multi-core scheduler support"
+        depends on ARM_CPU_TOPOLOGY
+        help
+          Multi-core scheduler support improves the CPU scheduler's decision
+          making when dealing with multi-core CPU chips at a cost of slightly
+          increased overhead in some places. If unsure say N here.
+
+config SCHED_SMT
+        bool "SMT scheduler support"
+        depends on ARM_CPU_TOPOLOGY
+        help
+          Improves the CPU scheduler's decision making when dealing with
+          MultiThreading at a cost of slightly increased overhead in some
+          places. If unsure say N here.
+
 config HAVE_ARM_SCU
         bool
         help
@@ -1472,6 +1513,7 @@ config THUMB2_KERNEL
         depends on CPU_V7 && !CPU_V6 && !CPU_V6K && EXPERIMENTAL
         select AEABI
         select ARM_ASM_UNIFIED
+        select ARM_UNWIND
         help
           By enabling this option, the kernel will be compiled in
           Thumb-2 mode. A compiler/assembler that understand the unified
@@ -2091,6 +2133,9 @@ config ARCH_SUSPEND_POSSIBLE
                 CPU_V6 || CPU_V6K || CPU_V7 || CPU_XSC3 || CPU_XSCALE
         def_bool y
 
+config ARM_CPU_SUSPEND
+        def_bool PM_SLEEP
+
 endmenu
 
 source "net/Kconfig"