1 files changed, 23 insertions, 81 deletions

diff --git a/arch/sh/Kconfig.debug b/arch/sh/Kconfig.debug
index e6d2c8b11abd..0d62681f72a0 100644
--- a/arch/sh/Kconfig.debug
+++ b/arch/sh/Kconfig.debug
@@ -98,18 +98,29 @@ config IRQSTACKS
           for handling hard and soft interrupts.  This can help avoid
           overflowing the process kernel stacks.
 
-config SH_KGDB
-        bool "Include KGDB kernel debugger"
-        select FRAME_POINTER
-        select DEBUG_INFO
-        depends on CPU_SH3 || CPU_SH4
+config DUMP_CODE
+        bool "Show disassembly of nearby code in register dumps"
+        depends on DEBUG_KERNEL && SUPERH32
+        default y if DEBUG_BUGVERBOSE
+        default n
+        help
+          This prints out a code trace of the instructions leading up to
+          the faulting instruction as a debugging aid. As this does grow
+          the kernel in size a bit, most users will want to say N here.
+
+          Those looking for more verbose debugging output should say Y.
+
+config SH_NO_BSS_INIT
+        bool "Avoid zeroing BSS (to speed-up startup on suitable platforms)"
+        depends on DEBUG_KERNEL
+        default n
         help
-          Include in-kernel hooks for kgdb, the Linux kernel source level
-          debugger.  See <http://kgdb.sourceforge.net/> for more information.
-          Unless you are intending to debug the kernel, say N here.
+          If running in painfully slow environments, such as an RTL
+          simulation or from remote memory via SHdebug, where the memory
+          can already be gauranteed to ber zeroed on boot, say Y.
 
-menu "KGDB configuration options"
-        depends on SH_KGDB
+          For all other cases, say N. If this option seems perplexing, or
+          you aren't sure, say N.
 
 config MORE_COMPILE_OPTIONS
         bool "Add any additional compile options"
@@ -122,85 +133,16 @@ config COMPILE_OPTIONS
         string "Additional compile arguments"
         depends on MORE_COMPILE_OPTIONS
 
-config KGDB_NMI
-        def_bool n
-        prompt "Enter KGDB on NMI"
-
-config SH_KGDB_CONSOLE
-        def_bool n
-        prompt "Console messages through GDB"
-        depends on !SERIAL_SH_SCI_CONSOLE && SERIAL_SH_SCI=y
-        select SERIAL_CORE_CONSOLE
-
-config KGDB_SYSRQ
-        def_bool y
-        prompt "Allow SysRq 'G' to enter KGDB"
-        depends on MAGIC_SYSRQ
-
-comment "Serial port setup"
-
-config KGDB_DEFPORT
-        int "Port number (ttySCn)"
-        default "1"
-
-config KGDB_DEFBAUD
-        int "Baud rate"
-        default "115200"
-
-choice
-        prompt "Parity"
-        depends on SH_KGDB
-        default KGDB_DEFPARITY_N
-
-config KGDB_DEFPARITY_N
-        bool "None"
-
-config KGDB_DEFPARITY_E
-        bool "Even"
-
-config KGDB_DEFPARITY_O
-        bool "Odd"
-
-endchoice
-
-choice
-        prompt "Data bits"
-        depends on SH_KGDB
-        default KGDB_DEFBITS_8
-
-config KGDB_DEFBITS_8
-        bool "8"
-
-config KGDB_DEFBITS_7
-        bool "7"
-
-endchoice
-
-endmenu
-
-if SUPERH64
-
-config SH64_PROC_ASIDS
-        bool "Debug: report ASIDs through /proc/asids"
-        depends on PROC_FS && MMU
-
 config SH64_SR_WATCH
         bool "Debug: set SR.WATCH to enable hardware watchpoints and trace"
+        depends on SUPERH64
 
 config POOR_MANS_STRACE
         bool "Debug: enable rudimentary strace facility"
+        depends on SUPERH64
         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