Merge branch 'powerpc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus...

[linux-2.6] / lib / Kconfig.kgdb

diff --git a/lib/Kconfig.kgdb b/lib/Kconfig.kgdb
index aaabcddcda5af415f666b9a5e793fbbcd79c9b5b..a5d4b1dac2a574ed09870e2ce25b2e300f07a1d5 100644 (file)
--- a/lib/Kconfig.kgdb
+++ b/lib/Kconfig.kgdb
@@ -1,4 +1,10 @@
 
+config HAVE_ARCH_KGDB_SHADOW_INFO
+       bool
+
+config HAVE_ARCH_KGDB
+       bool
+
 menuconfig KGDB
        bool "KGDB: kernel debugging with remote gdb"
        select FRAME_POINTER
@@ -10,15 +16,10 @@ menuconfig KGDB
          at http://kgdb.sourceforge.net as well as in DocBook form
          in Documentation/DocBook/.  If unsure, say N.
 
-config HAVE_ARCH_KGDB_SHADOW_INFO
-       bool
-
-config HAVE_ARCH_KGDB
-       bool
+if KGDB
 
 config KGDB_SERIAL_CONSOLE
        tristate "KGDB: use kgdb over the serial console"
-       depends on KGDB
        select CONSOLE_POLL
        select MAGIC_SYSRQ
        default y
@@ -28,7 +29,6 @@ config KGDB_SERIAL_CONSOLE
 
 config KGDB_TESTS
        bool "KGDB: internal test suite"
-       depends on KGDB
        default n
        help
          This is a kgdb I/O module specifically designed to test
@@ -38,3 +38,23 @@ config KGDB_TESTS
          See the drivers/misc/kgdbts.c for the details about
          the tests.  The most basic of this I/O module is to boot
          a kernel boot arguments "kgdbwait kgdbts=V1F100"
+
+config KGDB_TESTS_ON_BOOT
+       bool "KGDB: Run tests on boot"
+       depends on KGDB_TESTS
+       default n
+       help
+         Run the kgdb tests on boot up automatically without the need
+         to pass in a kernel parameter
+
+config KGDB_TESTS_BOOT_STRING
+       string "KGDB: which internal kgdb tests to run"
+       depends on KGDB_TESTS_ON_BOOT
+       default "V1F100"
+       help
+         This is the command string to send the kgdb test suite on
+         boot.  See the drivers/misc/kgdbts.c for detailed
+         information about other strings you could use beyond the
+         default of V1F100.
+
+endif # KGDB