1 files changed, 26 insertions, 77 deletions

diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index babc2b826c5..ff9177c8f64 100644
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -4,8 +4,6 @@ config SUPERH
         select CLKDEV_LOOKUP
         select HAVE_IDE if HAS_IOPORT
         select HAVE_MEMBLOCK
-        select HAVE_MEMBLOCK_NODE_MAP
-        select ARCH_DISCARD_MEMBLOCK
         select HAVE_OPROFILE
         select HAVE_GENERIC_DMA_COHERENT
         select HAVE_ARCH_TRACEHOOK
@@ -13,33 +11,21 @@ config SUPERH
         select HAVE_DMA_ATTRS
         select HAVE_IRQ_WORK
         select HAVE_PERF_EVENTS
-        select HAVE_DEBUG_BUGVERBOSE
-        select ARCH_HAVE_CUSTOM_GPIO_H
         select ARCH_HAVE_NMI_SAFE_CMPXCHG if (GUSA_RB || CPU_SH4A)
         select PERF_USE_VMALLOC
-        select HAVE_DEBUG_KMEMLEAK
         select HAVE_KERNEL_GZIP
         select HAVE_KERNEL_BZIP2
         select HAVE_KERNEL_LZMA
         select HAVE_KERNEL_XZ
         select HAVE_KERNEL_LZO
-        select HAVE_UID16
-        select ARCH_WANT_IPC_PARSE_VERSION
         select HAVE_SYSCALL_TRACEPOINTS
         select HAVE_REGS_AND_STACK_ACCESS_API
         select HAVE_GENERIC_HARDIRQS
-        select MAY_HAVE_SPARSE_IRQ
+        select HAVE_SPARSE_IRQ
         select IRQ_FORCED_THREADING
         select RTC_LIB
         select GENERIC_ATOMIC64
         select GENERIC_IRQ_SHOW
-        select GENERIC_SMP_IDLE_THREAD
-        select GENERIC_CLOCKEVENTS
-        select GENERIC_CMOS_UPDATE if SH_SH03 || SH_DREAMCAST
-        select GENERIC_STRNCPY_FROM_USER
-        select GENERIC_STRNLEN_USER
-        select HAVE_MOD_ARCH_SPECIFIC if DWARF_UNWINDER
-        select MODULES_USE_ELF_RELA
         help
           The SuperH is a RISC processor targeted for use in embedded systems
           and consumer electronics; it was also used in the Sega Dreamcast
@@ -56,7 +42,6 @@ config SUPERH32
         select HAVE_DYNAMIC_FTRACE
         select HAVE_FUNCTION_TRACE_MCOUNT_TEST
         select HAVE_FTRACE_NMI_ENTER if DYNAMIC_FTRACE
-        select ARCH_WANT_IPC_PARSE_VERSION
         select HAVE_FUNCTION_GRAPH_TRACER
         select HAVE_ARCH_KGDB
         select HAVE_HW_BREAKPOINT
@@ -67,7 +52,6 @@ config SUPERH32
 
 config SUPERH64
         def_bool ARCH = "sh64"
-        select KALLSYMS
 
 config ARCH_DEFCONFIG
         string
@@ -100,10 +84,27 @@ config GENERIC_GPIO
 config GENERIC_CALIBRATE_DELAY
         bool
 
+config GENERIC_IOMAP
+        bool
+
+config GENERIC_CLOCKEVENTS
+        def_bool y
+
+config GENERIC_CLOCKEVENTS_BROADCAST
+        bool
+
+config GENERIC_CMOS_UPDATE
+        def_bool y
+        depends on SH_SH03 || SH_DREAMCAST
+
 config GENERIC_LOCKBREAK
         def_bool y
         depends on SMP && PREEMPT
 
+config SYS_SUPPORTS_PM
+        bool
+        depends on !SMP
+
 config ARCH_SUSPEND_POSSIBLE
         def_bool n
 
@@ -156,17 +157,16 @@ config ARCH_NO_VIRT_TO_BUS
 config ARCH_HAS_DEFAULT_IDLE
         def_bool y
 
+config ARCH_HAS_CPU_IDLE_WAIT
+        def_bool y
+
 config NO_IOPORT
         def_bool !PCI
-        depends on !SH_CAYMAN && !SH_SH4202_MICRODEV && !SH_SHMIN && \
-                   !SH_HP6XX && !SH_SOLUTION_ENGINE
+        depends on !SH_CAYMAN && !SH_SH4202_MICRODEV && !SH_SHMIN
 
 config IO_TRAPPED
         bool
 
-config SWAP_IO_SPACE
-        bool
-
 config DMA_COHERENT
         bool
 
@@ -290,20 +290,6 @@ 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
@@ -443,16 +429,6 @@ 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
@@ -610,9 +586,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_SUBTYPE_SH7734 && !CPU_SUBTYPE_SH7264 && \
-                      !CPU_SUBTYPE_SH7269
+                      !CPU_SHX3 && !CPU_SUBTYPE_SH7757
+
+source "kernel/time/Kconfig"
 
 endmenu
 
@@ -673,7 +649,7 @@ config CRASH_DUMP
           a specially reserved region and then later executed after
           a crash by kdump/kexec. The crash dump kernel must be compiled
           to a memory address not used by the main kernel using
-          PHYSICAL_START.
+          MEMORY_START.
 
           For more details see Documentation/kdump/kdump.txt
 
@@ -684,17 +660,6 @@ config KEXEC_JUMP
           Jump between original kernel and kexeced kernel and invoke
           code via KEXEC
 
-config PHYSICAL_START
-        hex "Physical address where the kernel is loaded" if (EXPERT || CRASH_DUMP)
-        default MEMORY_START
-        ---help---
-          This gives the physical address where the kernel is loaded
-          and is ordinarily the same as MEMORY_START.
-
-          Different values are primarily used in the case of kexec on panic
-          where the fail safe kernel needs to run at a different address
-          than the panic-ed kernel.
-
 config SECCOMP
         bool "Enable seccomp to safely compute untrusted bytecode"
         depends on PROC_FS
@@ -711,20 +676,6 @@ 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
@@ -902,8 +853,6 @@ config PCI
         bool "PCI support"
         depends on SYS_SUPPORTS_PCI
         select PCI_DOMAINS
-        select GENERIC_PCI_IOMAP
-        select NO_GENERIC_PCI_IOPORT_MAP
         help
           Find out whether you have a PCI motherboard. PCI is the name of a
           bus system, i.e. the way the CPU talks to the other stuff inside