Merge git://git.infradead.org/users/eparis/audit
[cascardo/linux.git] / arch / sh / Kconfig
index 675fb7c..834b67c 100644 (file)
@@ -3,7 +3,7 @@ config SUPERH
        select ARCH_MIGHT_HAVE_PC_PARPORT
        select EXPERT
        select CLKDEV_LOOKUP
-       select HAVE_IDE if HAS_IOPORT
+       select HAVE_IDE if HAS_IOPORT_MAP
        select HAVE_MEMBLOCK
        select HAVE_MEMBLOCK_NODE_MAP
        select ARCH_DISCARD_MEMBLOCK
@@ -67,6 +67,7 @@ config SUPERH32
        select PERF_EVENTS
        select ARCH_HIBERNATION_POSSIBLE if MMU
        select SPARSE_IRQ
+       select HAVE_CC_STACKPROTECTOR
 
 config SUPERH64
        def_bool ARCH = "sh64"
@@ -123,15 +124,6 @@ config SYS_SUPPORTS_NUMA
 config SYS_SUPPORTS_PCI
        bool
 
-config SYS_SUPPORTS_CMT
-       bool
-
-config SYS_SUPPORTS_MTU2
-       bool
-
-config SYS_SUPPORTS_TMU
-       bool
-
 config STACKTRACE_SUPPORT
        def_bool y
 
@@ -147,7 +139,7 @@ config ARCH_HAS_ILOG2_U32
 config ARCH_HAS_ILOG2_U64
        def_bool n
 
-config NO_IOPORT
+config NO_IOPORT_MAP
        def_bool !PCI
        depends on !SH_CAYMAN && !SH_SH4202_MICRODEV && !SH_SHMIN && \
                   !SH_HP6XX && !SH_SOLUTION_ENGINE
@@ -191,14 +183,14 @@ config CPU_SH3
        bool
        select CPU_HAS_INTEVT
        select CPU_HAS_SR_RB
-       select SYS_SUPPORTS_TMU
+       select SYS_SUPPORTS_SH_TMU
 
 config CPU_SH4
        bool
        select CPU_HAS_INTEVT
        select CPU_HAS_SR_RB
        select CPU_HAS_FPU if !CPU_SH4AL_DSP
-       select SYS_SUPPORTS_TMU
+       select SYS_SUPPORTS_SH_TMU
        select SYS_SUPPORTS_HUGETLBFS if MMU
 
 config CPU_SH4A
@@ -213,7 +205,7 @@ config CPU_SH4AL_DSP
 config CPU_SH5
        bool
        select CPU_HAS_FPU
-       select SYS_SUPPORTS_TMU
+       select SYS_SUPPORTS_SH_TMU
        select SYS_SUPPORTS_HUGETLBFS if MMU
 
 config CPU_SHX2
@@ -250,7 +242,7 @@ choice
 config CPU_SUBTYPE_SH7619
        bool "Support SH7619 processor"
        select CPU_SH2
-       select SYS_SUPPORTS_CMT
+       select SYS_SUPPORTS_SH_CMT
 
 # SH-2A Processor Support
 
@@ -258,50 +250,50 @@ config CPU_SUBTYPE_SH7201
        bool "Support SH7201 processor"
        select CPU_SH2A
        select CPU_HAS_FPU
-       select SYS_SUPPORTS_MTU2
+       select SYS_SUPPORTS_SH_MTU2
  
 config CPU_SUBTYPE_SH7203
        bool "Support SH7203 processor"
        select CPU_SH2A
        select CPU_HAS_FPU
-       select SYS_SUPPORTS_CMT
-       select SYS_SUPPORTS_MTU2
+       select SYS_SUPPORTS_SH_CMT
+       select SYS_SUPPORTS_SH_MTU2
        select ARCH_WANT_OPTIONAL_GPIOLIB
        select PINCTRL
 
 config CPU_SUBTYPE_SH7206
        bool "Support SH7206 processor"
        select CPU_SH2A
-       select SYS_SUPPORTS_CMT
-       select SYS_SUPPORTS_MTU2
+       select SYS_SUPPORTS_SH_CMT
+       select SYS_SUPPORTS_SH_MTU2
 
 config CPU_SUBTYPE_SH7263
        bool "Support SH7263 processor"
        select CPU_SH2A
        select CPU_HAS_FPU
-       select SYS_SUPPORTS_CMT
-       select SYS_SUPPORTS_MTU2
+       select SYS_SUPPORTS_SH_CMT
+       select SYS_SUPPORTS_SH_MTU2
 
 config CPU_SUBTYPE_SH7264
        bool "Support SH7264 processor"
        select CPU_SH2A
        select CPU_HAS_FPU
-       select SYS_SUPPORTS_CMT
-       select SYS_SUPPORTS_MTU2
+       select SYS_SUPPORTS_SH_CMT
+       select SYS_SUPPORTS_SH_MTU2
        select PINCTRL
 
 config CPU_SUBTYPE_SH7269
        bool "Support SH7269 processor"
        select CPU_SH2A
        select CPU_HAS_FPU
-       select SYS_SUPPORTS_CMT
-       select SYS_SUPPORTS_MTU2
+       select SYS_SUPPORTS_SH_CMT
+       select SYS_SUPPORTS_SH_MTU2
        select PINCTRL
 
 config CPU_SUBTYPE_MXG
        bool "Support MX-G processor"
        select CPU_SH2A
-       select SYS_SUPPORTS_MTU2
+       select SYS_SUPPORTS_SH_MTU2
        help
          Select MX-G if running on an R8A03022BG part.
 
@@ -354,9 +346,8 @@ config CPU_SUBTYPE_SH7720
        bool "Support SH7720 processor"
        select CPU_SH3
        select CPU_HAS_DSP
-       select SYS_SUPPORTS_CMT
+       select SYS_SUPPORTS_SH_CMT
        select ARCH_WANT_OPTIONAL_GPIOLIB
-       select USB_ARCH_HAS_OHCI
        select USB_OHCI_SH if USB_OHCI_HCD
        select PINCTRL
        help
@@ -366,8 +357,7 @@ config CPU_SUBTYPE_SH7721
        bool "Support SH7721 processor"
        select CPU_SH3
        select CPU_HAS_DSP
-       select SYS_SUPPORTS_CMT
-       select USB_ARCH_HAS_OHCI
+       select SYS_SUPPORTS_SH_CMT
        select USB_OHCI_SH if USB_OHCI_HCD
        help
          Select SH7721 if you have a SH3-DSP SH7721 CPU.
@@ -422,7 +412,7 @@ config CPU_SUBTYPE_SH7723
        select CPU_SHX2
        select ARCH_SHMOBILE
        select ARCH_SPARSEMEM_ENABLE
-       select SYS_SUPPORTS_CMT
+       select SYS_SUPPORTS_SH_CMT
        select ARCH_WANT_OPTIONAL_GPIOLIB
        select PINCTRL
        help
@@ -434,7 +424,7 @@ config CPU_SUBTYPE_SH7724
        select CPU_SHX2
        select ARCH_SHMOBILE
        select ARCH_SPARSEMEM_ENABLE
-       select SYS_SUPPORTS_CMT
+       select SYS_SUPPORTS_SH_CMT
        select ARCH_WANT_OPTIONAL_GPIOLIB
        select PINCTRL
        help
@@ -445,8 +435,6 @@ config CPU_SUBTYPE_SH7734
        select CPU_SH4A
        select CPU_SHX2
        select ARCH_WANT_OPTIONAL_GPIOLIB
-       select USB_ARCH_HAS_OHCI
-       select USB_ARCH_HAS_EHCI
        select PINCTRL
        help
          Select SH7734 if you have a SH4A SH7734 CPU.
@@ -456,8 +444,6 @@ config CPU_SUBTYPE_SH7757
        select CPU_SH4A
        select CPU_SHX2
        select ARCH_WANT_OPTIONAL_GPIOLIB
-       select USB_ARCH_HAS_OHCI
-       select USB_ARCH_HAS_EHCI
        select PINCTRL
        help
          Select SH7757 if you have a SH4A SH7757 CPU.
@@ -465,7 +451,6 @@ config CPU_SUBTYPE_SH7757
 config CPU_SUBTYPE_SH7763
        bool "Support SH7763 processor"
        select CPU_SH4A
-       select USB_ARCH_HAS_OHCI
        select USB_OHCI_SH if USB_OHCI_HCD
        help
          Select SH7763 if you have a SH4A SH7763(R5S77631) CPU.
@@ -494,9 +479,7 @@ config CPU_SUBTYPE_SH7786
        select CPU_HAS_PTEAEX
        select GENERIC_CLOCKEVENTS_BROADCAST if SMP
        select ARCH_WANT_OPTIONAL_GPIOLIB
-       select USB_ARCH_HAS_OHCI
        select USB_OHCI_SH if USB_OHCI_HCD
-       select USB_ARCH_HAS_EHCI
        select USB_EHCI_SH if USB_EHCI_HCD
        select PINCTRL
 
@@ -514,7 +497,7 @@ config CPU_SUBTYPE_SH7343
        bool "Support SH7343 processor"
        select CPU_SH4AL_DSP
        select ARCH_SHMOBILE
-       select SYS_SUPPORTS_CMT
+       select SYS_SUPPORTS_SH_CMT
 
 config CPU_SUBTYPE_SH7722
        bool "Support SH7722 processor"
@@ -523,7 +506,7 @@ config CPU_SUBTYPE_SH7722
        select ARCH_SHMOBILE
        select ARCH_SPARSEMEM_ENABLE
        select SYS_SUPPORTS_NUMA
-       select SYS_SUPPORTS_CMT
+       select SYS_SUPPORTS_SH_CMT
        select ARCH_WANT_OPTIONAL_GPIOLIB
        select PINCTRL
 
@@ -534,7 +517,7 @@ config CPU_SUBTYPE_SH7366
        select ARCH_SHMOBILE
        select ARCH_SPARSEMEM_ENABLE
        select SYS_SUPPORTS_NUMA
-       select SYS_SUPPORTS_CMT
+       select SYS_SUPPORTS_SH_CMT
 
 endchoice
 
@@ -567,27 +550,6 @@ source "arch/sh/boards/Kconfig"
 
 menu "Timer and clock configuration"
 
-config SH_TIMER_TMU
-       bool "TMU timer driver"
-       depends on SYS_SUPPORTS_TMU
-       default y
-       help
-         This enables the build of the TMU timer driver.
-
-config SH_TIMER_CMT
-       bool "CMT timer driver"
-       depends on SYS_SUPPORTS_CMT
-       default y
-       help
-         This enables build of the CMT timer driver.
-
-config SH_TIMER_MTU2
-       bool "MTU2 timer driver"
-       depends on SYS_SUPPORTS_MTU2
-       default y
-       help
-         This enables build of the MTU2 timer driver.
-
 config SH_PCLK_FREQ
        int "Peripheral clock frequency (in Hz)"
        depends on SH_CLK_CPG_LEGACY
@@ -696,32 +658,18 @@ config SECCOMP
 
          If unsure, say N.
 
-config CC_STACKPROTECTOR
-       bool "Enable -fstack-protector buffer overflow detection (EXPERIMENTAL)"
-       depends on SUPERH32
-       help
-         This option turns on the -fstack-protector GCC feature. This
-         feature puts, at the beginning of functions, a canary value on
-         the stack just before the return address, and validates
-         the value just before actually returning.  Stack based buffer
-         overflows (that need to overwrite this return address) now also
-         overwrite the canary, which gets detected and the attack is then
-         neutralized via a kernel panic.
-
-         This feature requires gcc version 4.2 or above.
-
 config SMP
        bool "Symmetric multi-processing support"
        depends on SYS_SUPPORTS_SMP
        ---help---
          This enables support for systems with more than one CPU. If you have
-         a system with only one CPU, like most personal computers, say N. If
-         you have a system with more than one CPU, say Y.
+         a system with only one CPU, say N. If you have a system with more
+         than one CPU, say Y.
 
-         If you say N here, the kernel will run on single and multiprocessor
+         If you say N here, the kernel will run on uni- and multiprocessor
          machines, but will use only one CPU of a multiprocessor machine. If
          you say Y here, the kernel will run on many, but not all,
-         singleprocessor machines. On a singleprocessor machine, the kernel
+         uniprocessor machines. On a uniprocessor machine, the kernel
          will run faster if you say N here.
 
          People using multiprocessor machines who say Y here should also say