Merge branch 'for-next' of git://git.pengutronix.de/git/ukl/linux into devel-stable

[karo-tx-linux.git] / arch / sh / Kconfig

diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index 9c833c5858712b88897eec7c135842242d8e2d75..5e859633ce69f13c9d2b1d1c1a5727ad986a9fab 100644 (file)
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -39,6 +39,8 @@ config SUPERH
        select GENERIC_STRNLEN_USER
        select HAVE_MOD_ARCH_SPECIFIC if DWARF_UNWINDER
        select MODULES_USE_ELF_RELA
+       select OLD_SIGSUSPEND
+       select OLD_SIGACTION
        help
          The SuperH is a RISC processor targeted for use in embedded systems
          and consumer electronics; it was also used in the Sega Dreamcast
@@ -146,9 +148,6 @@ config ARCH_HAS_ILOG2_U32
 config ARCH_HAS_ILOG2_U64
        def_bool n
 
-config ARCH_NO_VIRT_TO_BUS
-       def_bool y
-
 config ARCH_HAS_DEFAULT_IDLE
        def_bool y
 
@@ -272,6 +271,7 @@ config CPU_SUBTYPE_SH7203
        select SYS_SUPPORTS_CMT
        select SYS_SUPPORTS_MTU2
        select ARCH_WANT_OPTIONAL_GPIOLIB
+       select PINCTRL
 
 config CPU_SUBTYPE_SH7206
        bool "Support SH7206 processor"
@@ -292,6 +292,7 @@ config CPU_SUBTYPE_SH7264
        select CPU_HAS_FPU
        select SYS_SUPPORTS_CMT
        select SYS_SUPPORTS_MTU2
+       select PINCTRL
 
 config CPU_SUBTYPE_SH7269
        bool "Support SH7269 processor"
@@ -299,6 +300,7 @@ config CPU_SUBTYPE_SH7269
        select CPU_HAS_FPU
        select SYS_SUPPORTS_CMT
        select SYS_SUPPORTS_MTU2
+       select PINCTRL
 
 config CPU_SUBTYPE_MXG
        bool "Support MX-G processor"
@@ -360,6 +362,7 @@ config CPU_SUBTYPE_SH7720
        select ARCH_WANT_OPTIONAL_GPIOLIB
        select USB_ARCH_HAS_OHCI
        select USB_OHCI_SH if USB_OHCI_HCD
+       select PINCTRL
        help
          Select SH7720 if you have a SH3-DSP SH7720 CPU.
 
@@ -425,6 +428,7 @@ config CPU_SUBTYPE_SH7723
        select ARCH_SPARSEMEM_ENABLE
        select SYS_SUPPORTS_CMT
        select ARCH_WANT_OPTIONAL_GPIOLIB
+       select PINCTRL
        help
          Select SH7723 if you have an SH-MobileR2 CPU.
 
@@ -436,6 +440,7 @@ config CPU_SUBTYPE_SH7724
        select ARCH_SPARSEMEM_ENABLE
        select SYS_SUPPORTS_CMT
        select ARCH_WANT_OPTIONAL_GPIOLIB
+       select PINCTRL
        help
          Select SH7724 if you have an SH-MobileR2R CPU.
 
@@ -446,6 +451,7 @@ config CPU_SUBTYPE_SH7734
        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,6 +462,7 @@ config CPU_SUBTYPE_SH7757
        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.
 
@@ -482,6 +489,7 @@ config CPU_SUBTYPE_SH7785
        select ARCH_SPARSEMEM_ENABLE
        select SYS_SUPPORTS_NUMA
        select ARCH_WANT_OPTIONAL_GPIOLIB
+       select PINCTRL
 
 config CPU_SUBTYPE_SH7786
        bool "Support SH7786 processor"
@@ -494,6 +502,7 @@ config CPU_SUBTYPE_SH7786
        select USB_OHCI_SH if USB_OHCI_HCD
        select USB_ARCH_HAS_EHCI
        select USB_EHCI_SH if USB_EHCI_HCD
+       select PINCTRL
 
 config CPU_SUBTYPE_SHX3
        bool "Support SH-X3 processor"
@@ -501,6 +510,7 @@ config CPU_SUBTYPE_SHX3
        select CPU_SHX3
        select GENERIC_CLOCKEVENTS_BROADCAST if SMP
        select ARCH_REQUIRE_GPIOLIB
+       select PINCTRL
 
 # SH4AL-DSP Processor Support
 
@@ -519,6 +529,7 @@ config CPU_SUBTYPE_SH7722
        select SYS_SUPPORTS_NUMA
        select SYS_SUPPORTS_CMT
        select ARCH_WANT_OPTIONAL_GPIOLIB
+       select PINCTRL
 
 config CPU_SUBTYPE_SH7366
        bool "Support SH7366 processor"
@@ -644,7 +655,7 @@ source kernel/Kconfig.hz
 
 config KEXEC
        bool "kexec system call (EXPERIMENTAL)"
-       depends on SUPERH32 && EXPERIMENTAL && MMU
+       depends on SUPERH32 && MMU
        help
          kexec is a system call that implements the ability to shutdown your
          current kernel, and to start another kernel.  It is like a reboot
@@ -661,7 +672,7 @@ config KEXEC
 
 config CRASH_DUMP
        bool "kernel crash dumps (EXPERIMENTAL)"
-       depends on SUPERH32 && EXPERIMENTAL && BROKEN_ON_SMP
+       depends on SUPERH32 && BROKEN_ON_SMP
        help
          Generate crash dump after being started by kexec.
          This should be normally only set in special crash dump kernels
@@ -675,7 +686,7 @@ config CRASH_DUMP
 
 config KEXEC_JUMP
        bool "kexec jump (EXPERIMENTAL)"
-       depends on SUPERH32 && KEXEC && HIBERNATION && EXPERIMENTAL
+       depends on SUPERH32 && KEXEC && HIBERNATION
        help
          Jump between original kernel and kexeced kernel and invoke
          code via KEXEC
@@ -709,7 +720,7 @@ config SECCOMP
 
 config CC_STACKPROTECTOR
        bool "Enable -fstack-protector buffer overflow detection (EXPERIMENTAL)"
-       depends on SUPERH32 && 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
@@ -760,7 +771,7 @@ config NR_CPUS
 
 config HOTPLUG_CPU
        bool "Support for hot-pluggable CPUs (EXPERIMENTAL)"
-       depends on SMP && HOTPLUG && EXPERIMENTAL
+       depends on SMP && HOTPLUG
        help
          Say Y here to experiment with turning CPUs off and on.  CPUs
          can be controlled through /sys/devices/system/cpu.
@@ -839,7 +850,7 @@ config ENTRY_OFFSET
 
 config ROMIMAGE_MMCIF
        bool "Include MMCIF loader in romImage (EXPERIMENTAL)"
-       depends on CPU_SUBTYPE_SH7724 && EXPERIMENTAL
+       depends on CPU_SUBTYPE_SH7724
        help
          Say Y here to include experimental MMCIF loading code in
          romImage. With this enabled it is possible to write the romImage
@@ -925,7 +936,6 @@ source "fs/Kconfig.binfmt"
 endmenu
 
 menu "Power management options (EXPERIMENTAL)"
-depends on EXPERIMENTAL
 
 source "kernel/power/Kconfig"