Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[uclinux-h8/linux.git] / arch / arc / Kconfig

diff --git a/arch/arc/Kconfig b/arch/arc/Kconfig
index f09e03a..e7cee0a 100644 (file)
--- a/arch/arc/Kconfig
+++ b/arch/arc/Kconfig
@@ -97,11 +97,10 @@ config ISA_ARCOMPACT
        help
          The original ARC ISA of ARC600/700 cores
 
-### For bisectability, disable ARCv2 support until we have all the bits in place
-#config ISA_ARCV2
-#      bool "ARC ISA v2"
-#      help
-#        ISA for the Next Generation ARC-HS cores
+config ISA_ARCV2
+       bool "ARC ISA v2"
+       help
+         ISA for the Next Generation ARC-HS cores
 
 endchoice
 
@@ -160,12 +159,12 @@ config CPU_BIG_ENDIAN
          Build kernel for Big Endian Mode of ARC CPU
 
 config SMP
-       bool "Symmetric Multi-Processing (Incomplete)"
+       bool "Symmetric Multi-Processing"
        default n
+       select ARC_HAS_COH_CACHES if ISA_ARCV2
+       select ARC_MCIP if ISA_ARCV2
        help
-         This enables support for systems with more than one CPU. If you have
-         a system with only one CPU, say N. If you have a system with more
-         than one CPU, say Y.
+         This enables support for systems with more than one CPU.
 
 if SMP
 
@@ -175,13 +174,20 @@ config ARC_HAS_COH_CACHES
 config ARC_HAS_REENTRANT_IRQ_LV2
        def_bool n
 
-endif  #SMP
+config ARC_MCIP
+       bool "ARConnect Multicore IP (MCIP) Support "
+       depends on ISA_ARCV2
+       help
+         This IP block enables SMP in ARC-HS38 cores.
+         It provides for cross-core interrupts, multi-core debug
+         hardware semaphores, shared memory,....
 
 config NR_CPUS
        int "Maximum number of CPUs (2-4096)"
        range 2 4096
-       depends on SMP
-       default "2"
+       default "4"
+
+endif  #SMP
 
 menuconfig ARC_CACHE
        bool "Enable Cache Support"
@@ -377,6 +383,11 @@ config ARC_HAS_RTC
        default n
        depends on !SMP
 
+config ARC_HAS_GRTC
+       bool "SMP synchronized 64-bit cycle counter"
+       default y
+       depends on SMP
+
 config ARC_NUMBER_OF_INTERRUPTS
        int "Number of interrupts"
        range 8 240
@@ -441,9 +452,10 @@ menuconfig ARC_DBG
        bool "ARC debugging"
        default y
 
+if ARC_DBG
+
 config ARC_DW2_UNWIND
        bool "Enable DWARF specific kernel stack unwind"
-       depends on ARC_DBG
        default y
        select KALLSYMS
        help
@@ -457,18 +469,26 @@ config ARC_DW2_UNWIND
 
 config ARC_DBG_TLB_PARANOIA
        bool "Paranoia Checks in Low Level TLB Handlers"
-       depends on ARC_DBG
        default n
 
 config ARC_DBG_TLB_MISS_COUNT
        bool "Profile TLB Misses"
        default n
        select DEBUG_FS
-       depends on ARC_DBG
        help
          Counts number of I and D TLB Misses and exports them via Debugfs
          The counters can be cleared via Debugfs as well
 
+if SMP
+
+config ARC_IPI_DBG
+       bool "Debug Inter Core interrupts"
+       default n
+
+endif
+
+endif
+
 config ARC_UBOOT_SUPPORT
        bool "Support uboot arg Handling"
        default n