sh: Merge sh64 Kconfig.debug options.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>

diff --git a/arch/sh/Kconfig.debug b/arch/sh/Kconfig.debug
index 722da6851f569abe5ee44bec961ac958a2f4ad33..f9ce46f1e6ffe4e007e44b30eccd0e501844f3eb 100644 (file)
--- a/arch/sh/Kconfig.debug
+++ b/arch/sh/Kconfig.debug
@@ -174,4 +174,29 @@ endchoice
 
 endmenu
 
+if SUPERH64
+
+config SH64_PROC_ASIDS
+       bool "Debug: report ASIDs through /proc/asids"
+       depends on PROC_FS
+
+config SH64_SR_WATCH
+       bool "Debug: set SR.WATCH to enable hardware watchpoints and trace"
+
+config POOR_MANS_STRACE
+       bool "Debug: enable rudimentary strace facility"
+       help
+         This option allows system calls to be traced to the console.  It also
+         aids in detecting kernel stack underflow.  It is useful for debugging
+         early-userland problems (e.g. init incurring fatal exceptions.)
+
+config SH_ALPHANUMERIC
+       bool "Enable debug outputs to on-board alphanumeric display"
+       depends on SH_CAYMAN
+
+config SH_NO_BSS_INIT
+       bool "Avoid zeroing BSS (to speed-up startup on suitable platforms)"
+
+endif
+
 endmenu

diff --git a/arch/sh64/Kconfig.debug b/arch/sh64/Kconfig.debug
deleted file mode 100644 (file)
index 05c07c4..0000000
--- a/arch/sh64/Kconfig.debug
+++ /dev/null
@@ -1,33 +0,0 @@
-menu "Kernel hacking"
-
-source "lib/Kconfig.debug"
-
-config EARLY_PRINTK
-       bool "Early SCIF console support"
-
-config SH64_PROC_TLB
-       bool "Debug: report TLB fill/purge activity through /proc/tlb"
-       depends on PROC_FS
-
-config SH64_PROC_ASIDS
-       bool "Debug: report ASIDs through /proc/asids"
-       depends on PROC_FS
-
-config SH64_SR_WATCH
-       bool "Debug: set SR.WATCH to enable hardware watchpoints and trace"
-
-config POOR_MANS_STRACE
-       bool "Debug: enable rudimentary strace facility"
-       help
-         This option allows system calls to be traced to the console.  It also
-         aids in detecting kernel stack underflow.  It is useful for debugging
-         early-userland problems (e.g. init incurring fatal exceptions.)
-
-config SH_ALPHANUMERIC
-       bool "Enable debug outputs to on-board alphanumeric display"
-       depends on SH_CAYMAN
-
-config SH_NO_BSS_INIT
-       bool "Avoid zeroing BSS (to speed-up startup on suitable platforms)"
-
-endmenu