Fix potential fast PIT TSC calibration startup glitch

[safe/jmp/linux-2.6] / arch / sh / Kconfig.debug

diff --git a/arch/sh/Kconfig.debug b/arch/sh/Kconfig.debug
index 0d2ef1e..0d62681 100644 (file)
--- a/arch/sh/Kconfig.debug
+++ b/arch/sh/Kconfig.debug
@@ -36,7 +36,8 @@ config EARLY_SCIF_CONSOLE_PORT
        default "0xff804000" if CPU_SUBTYPE_MXG
        default "0xffc30000" if CPU_SUBTYPE_SHX3
        default "0xffe00000" if CPU_SUBTYPE_SH7780 || CPU_SUBTYPE_SH7763 || \
-                               CPU_SUBTYPE_SH7722 || CPU_SUBTYPE_SH7366
+                               CPU_SUBTYPE_SH7722 || CPU_SUBTYPE_SH7366 || \
+                               CPU_SUBTYPE_SH7343
        default "0xffe80000" if CPU_SH4
        default "0xffea0000" if CPU_SUBTYPE_SH7785
        default "0xfffe8000" if CPU_SUBTYPE_SH7203
@@ -81,7 +82,7 @@ config DEBUG_STACK_USAGE
 
 config 4KSTACKS
        bool "Use 4Kb for kernel stacks instead of 8Kb"
-       depends on DEBUG_KERNEL
+       depends on DEBUG_KERNEL && (MMU || BROKEN) && !PAGE_SIZE_64KB
        help
          If you say Y here the kernel will use a 4Kb stacksize for the
          kernel stack attached to each process/thread. This facilitates
@@ -97,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
-         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.
+         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.
 
-menu "KGDB configuration options"
-       depends on SH_KGDB
+         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
+         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.
+
+         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"
@@ -121,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
-
 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