Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target...

[firefly-linux-kernel-4.4.55.git] / arch / arm / mm / Kconfig

diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig
index b4f92b9a13ac85c1c425542ff50b6df2783b3c50..7c6b976ab8d39d0f5005b9f8c815a752d1ab0f8b 100644 (file)
--- a/arch/arm/mm/Kconfig
+++ b/arch/arm/mm/Kconfig
@@ -6,7 +6,7 @@ comment "Processor Type"
 
 # ARM7TDMI
 config CPU_ARM7TDMI
-       bool "Support ARM7TDMI processor"
+       bool
        depends on !MMU
        select CPU_32v4T
        select CPU_ABRT_LV4T
@@ -56,7 +56,7 @@ config CPU_ARM740T
 
 # ARM9TDMI
 config CPU_ARM9TDMI
-       bool "Support ARM9TDMI processor"
+       bool
        depends on !MMU
        select CPU_32v4T
        select CPU_ABRT_NOMMU
@@ -604,6 +604,22 @@ config CPU_USE_DOMAINS
          This option enables or disables the use of domain switching
          via the set_fs() function.
 
+config CPU_V7M_NUM_IRQ
+       int "Number of external interrupts connected to the NVIC"
+       depends on CPU_V7M
+       default 90 if ARCH_STM32
+       default 38 if ARCH_EFM32
+       default 112 if SOC_VF610
+       default 240
+       help
+         This option indicates the number of interrupts connected to the NVIC.
+         The value can be larger than the real number of interrupts supported
+         by the system, but must not be lower.
+         The default value is 240, corresponding to the maximum number of
+         interrupts supported by the NVIC on Cortex-M family.
+
+         If unsure, keep default value.
+
 #
 # CPU supports 36-bit I/O
 #
@@ -624,6 +640,10 @@ config ARM_LPAE
 
          If unsure, say N.
 
+config ARM_PV_FIXUP
+       def_bool y
+       depends on ARM_LPAE && ARM_PATCH_PHYS_VIRT && ARCH_KEYSTONE
+
 config ARCH_PHYS_ADDR_T_64BIT
        def_bool ARM_LPAE