Merge tag 'sh-for-linus' of git://github.com/pmundt/linux-sh

[cascardo/linux.git] / arch / sh / Kconfig

diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index 04a8cb4..3e723aa 100644 (file)
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -155,7 +155,8 @@ config ARCH_HAS_DEFAULT_IDLE
 
 config NO_IOPORT
        def_bool !PCI
-       depends on !SH_CAYMAN && !SH_SH4202_MICRODEV && !SH_SHMIN
+       depends on !SH_CAYMAN && !SH_SH4202_MICRODEV && !SH_SHMIN && \
+                  !SH_HP6XX && !SH_SOLUTION_ENGINE
 
 config IO_TRAPPED
        bool
@@ -286,6 +287,20 @@ config CPU_SUBTYPE_SH7263
        select SYS_SUPPORTS_CMT
        select SYS_SUPPORTS_MTU2
 
+config CPU_SUBTYPE_SH7264
+       bool "Support SH7264 processor"
+       select CPU_SH2A
+       select CPU_HAS_FPU
+       select SYS_SUPPORTS_CMT
+       select SYS_SUPPORTS_MTU2
+
+config CPU_SUBTYPE_SH7269
+       bool "Support SH7269 processor"
+       select CPU_SH2A
+       select CPU_HAS_FPU
+       select SYS_SUPPORTS_CMT
+       select SYS_SUPPORTS_MTU2
+
 config CPU_SUBTYPE_MXG
        bool "Support MX-G processor"
        select CPU_SH2A
@@ -425,6 +440,16 @@ config CPU_SUBTYPE_SH7724
        help
          Select SH7724 if you have an SH-MobileR2R CPU.
 
+config CPU_SUBTYPE_SH7734
+       bool "Support SH7734 processor"
+       select CPU_SH4A
+       select CPU_SHX2
+       select ARCH_WANT_OPTIONAL_GPIOLIB
+       select USB_ARCH_HAS_OHCI
+       select USB_ARCH_HAS_EHCI
+       help
+         Select SH7734 if you have a SH4A SH7734 CPU.
+
 config CPU_SUBTYPE_SH7757
        bool "Support SH7757 processor"
        select CPU_SH4A
@@ -582,7 +607,9 @@ config SH_CLK_CPG
 config SH_CLK_CPG_LEGACY
        depends on SH_CLK_CPG
        def_bool y if !CPU_SUBTYPE_SH7785 && !ARCH_SHMOBILE && \
-                     !CPU_SHX3 && !CPU_SUBTYPE_SH7757
+                     !CPU_SHX3 && !CPU_SUBTYPE_SH7757 && \
+                     !CPU_SUBTYPE_SH7734 && !CPU_SUBTYPE_SH7264 && \
+                     !CPU_SUBTYPE_SH7269
 
 source "kernel/time/Kconfig"
 
@@ -683,6 +710,20 @@ config SECCOMP
 
          If unsure, say N.
 
+config CC_STACKPROTECTOR
+       bool "Enable -fstack-protector buffer overflow detection (EXPERIMENTAL)"
+       depends on SUPERH32 && EXPERIMENTAL
+       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