aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sh/Kconfig
diff options
context:
space:
mode:
Diffstat (limited to 'arch/sh/Kconfig')
-rw-r--r--arch/sh/Kconfig45
1 files changed, 43 insertions, 2 deletions
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index 04a8cb4700af..3e723aaa5e18 100644
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -155,7 +155,8 @@ config ARCH_HAS_DEFAULT_IDLE
155 155
156config NO_IOPORT 156config NO_IOPORT
157 def_bool !PCI 157 def_bool !PCI
158 depends on !SH_CAYMAN && !SH_SH4202_MICRODEV && !SH_SHMIN 158 depends on !SH_CAYMAN && !SH_SH4202_MICRODEV && !SH_SHMIN && \
159 !SH_HP6XX && !SH_SOLUTION_ENGINE
159 160
160config IO_TRAPPED 161config IO_TRAPPED
161 bool 162 bool
@@ -286,6 +287,20 @@ config CPU_SUBTYPE_SH7263
286 select SYS_SUPPORTS_CMT 287 select SYS_SUPPORTS_CMT
287 select SYS_SUPPORTS_MTU2 288 select SYS_SUPPORTS_MTU2
288 289
290config CPU_SUBTYPE_SH7264
291 bool "Support SH7264 processor"
292 select CPU_SH2A
293 select CPU_HAS_FPU
294 select SYS_SUPPORTS_CMT
295 select SYS_SUPPORTS_MTU2
296
297config CPU_SUBTYPE_SH7269
298 bool "Support SH7269 processor"
299 select CPU_SH2A
300 select CPU_HAS_FPU
301 select SYS_SUPPORTS_CMT
302 select SYS_SUPPORTS_MTU2
303
289config CPU_SUBTYPE_MXG 304config CPU_SUBTYPE_MXG
290 bool "Support MX-G processor" 305 bool "Support MX-G processor"
291 select CPU_SH2A 306 select CPU_SH2A
@@ -425,6 +440,16 @@ config CPU_SUBTYPE_SH7724
425 help 440 help
426 Select SH7724 if you have an SH-MobileR2R CPU. 441 Select SH7724 if you have an SH-MobileR2R CPU.
427 442
443config CPU_SUBTYPE_SH7734
444 bool "Support SH7734 processor"
445 select CPU_SH4A
446 select CPU_SHX2
447 select ARCH_WANT_OPTIONAL_GPIOLIB
448 select USB_ARCH_HAS_OHCI
449 select USB_ARCH_HAS_EHCI
450 help
451 Select SH7734 if you have a SH4A SH7734 CPU.
452
428config CPU_SUBTYPE_SH7757 453config CPU_SUBTYPE_SH7757
429 bool "Support SH7757 processor" 454 bool "Support SH7757 processor"
430 select CPU_SH4A 455 select CPU_SH4A
@@ -582,7 +607,9 @@ config SH_CLK_CPG
582config SH_CLK_CPG_LEGACY 607config SH_CLK_CPG_LEGACY
583 depends on SH_CLK_CPG 608 depends on SH_CLK_CPG
584 def_bool y if !CPU_SUBTYPE_SH7785 && !ARCH_SHMOBILE && \ 609 def_bool y if !CPU_SUBTYPE_SH7785 && !ARCH_SHMOBILE && \
585 !CPU_SHX3 && !CPU_SUBTYPE_SH7757 610 !CPU_SHX3 && !CPU_SUBTYPE_SH7757 && \
611 !CPU_SUBTYPE_SH7734 && !CPU_SUBTYPE_SH7264 && \
612 !CPU_SUBTYPE_SH7269
586 613
587source "kernel/time/Kconfig" 614source "kernel/time/Kconfig"
588 615
@@ -683,6 +710,20 @@ config SECCOMP
683 710
684 If unsure, say N. 711 If unsure, say N.
685 712
713config CC_STACKPROTECTOR
714 bool "Enable -fstack-protector buffer overflow detection (EXPERIMENTAL)"
715 depends on SUPERH32 && EXPERIMENTAL
716 help
717 This option turns on the -fstack-protector GCC feature. This
718 feature puts, at the beginning of functions, a canary value on
719 the stack just before the return address, and validates
720 the value just before actually returning. Stack based buffer
721 overflows (that need to overwrite this return address) now also
722 overwrite the canary, which gets detected and the attack is then
723 neutralized via a kernel panic.
724
725 This feature requires gcc version 4.2 or above.
726
686config SMP 727config SMP
687 bool "Symmetric multi-processing support" 728 bool "Symmetric multi-processing support"
688 depends on SYS_SUPPORTS_SMP 729 depends on SYS_SUPPORTS_SMP