Merge branch 'stable-4.7' of git://git.infradead.org/users/pcmoore/audit

[sfrench/cifs-2.6.git] / arch / arm / Kconfig

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index cdfa6c2b7626f3a761364ac072fc359b5f02592a..b99d25b4133e38bcd9513aa76a879b1e3565accf 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -41,7 +41,7 @@ config ARM
        select HAVE_ARCH_SECCOMP_FILTER if (AEABI && !OABI_COMPAT)
        select HAVE_ARCH_TRACEHOOK
        select HAVE_ARM_SMCCC if CPU_V7
-       select HAVE_BPF_JIT
+       select HAVE_CBPF_JIT
        select HAVE_CC_STACKPROTECTOR
        select HAVE_CONTEXT_TRACKING
        select HAVE_C_RECORDMCOUNT
@@ -531,6 +531,8 @@ config ARCH_LPC32XX
        select COMMON_CLK
        select CPU_ARM926T
        select GENERIC_CLOCKEVENTS
+       select MULTI_IRQ_HANDLER
+       select SPARSE_IRQ
        select USE_OF
        help
          Support for the NXP LPC32XX family of processors
@@ -775,6 +777,8 @@ source "arch/arm/mach-meson/Kconfig"
 
 source "arch/arm/mach-moxart/Kconfig"
 
+source "arch/arm/mach-aspeed/Kconfig"
+
 source "arch/arm/mach-mv78xx0/Kconfig"
 
 source "arch/arm/mach-imx/Kconfig"
@@ -804,6 +808,8 @@ source "arch/arm/plat-pxa/Kconfig"
 
 source "arch/arm/mach-mmp/Kconfig"
 
+source "arch/arm/mach-oxnas/Kconfig"
+
 source "arch/arm/mach-qcom/Kconfig"
 
 source "arch/arm/mach-realview/Kconfig"
@@ -892,6 +898,18 @@ config MACH_STM32F429
        depends on ARCH_STM32
        default y
 
+config ARCH_MPS2
+       bool "ARM MPS2 paltform"
+       depends on ARM_SINGLE_ARMV7M
+       select ARM_AMBA
+       select CLKSRC_MPS2
+       help
+         Support for Cortex-M Prototyping System (or V2M-MPS2) which comes
+         with a range of available cores like Cortex-M3/M4/M7.
+
+         Please, note that depends which Application Note is used memory map
+         for the platform may vary, so adjustment of RAM base might be needed.
+
 # Definitions to make life easier
 config ARCH_ACORN
        bool