Merge tag 'soc2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[karo-tx-linux.git] / arch / mn10300 / Kconfig.debug

diff --git a/arch/mn10300/Kconfig.debug b/arch/mn10300/Kconfig.debug
index ce83c74b3fd714abf68fca4a4d2beef024545c83..bdbfd444a9ff9cf5569baa685a906e5f8800801d 100644 (file)
--- a/arch/mn10300/Kconfig.debug
+++ b/arch/mn10300/Kconfig.debug
@@ -36,7 +36,7 @@ config KPROBES
 
 config GDBSTUB
        bool "Remote GDB kernel debugging"
 
 config GDBSTUB
        bool "Remote GDB kernel debugging"

-       depends on DEBUG_KERNEL
+       depends on DEBUG_KERNEL && DEPRECATED

        select DEBUG_INFO
        select FRAME_POINTER
        help
        select DEBUG_INFO
        select FRAME_POINTER
        help


@@ -46,6 +46,9 @@ config GDBSTUB
          RAM to avoid excessive linking time. This is only useful for kernel
          hackers. If unsure, say N.
 
          RAM to avoid excessive linking time. This is only useful for kernel
          hackers. If unsure, say N.
 

+         This is deprecated in favour of KGDB and will be removed in a later
+         version.
+

 config GDBSTUB_IMMEDIATE
        bool "Break into GDB stub immediately"
        depends on GDBSTUB
 config GDBSTUB_IMMEDIATE
        bool "Break into GDB stub immediately"
        depends on GDBSTUB


@@ -54,6 +57,14 @@ config GDBSTUB_IMMEDIATE
          possible, leaving the program counter at the beginning of
          start_kernel() in init/main.c.
 
          possible, leaving the program counter at the beginning of
          start_kernel() in init/main.c.
 

+config GDBSTUB_ALLOW_SINGLE_STEP
+       bool "Allow software single-stepping in GDB stub"
+       depends on GDBSTUB && !SMP && !PREEMPT
+       help
+         Allow GDB stub to perform software single-stepping through the
+         kernel.  This doesn't work very well on SMP or preemptible kernels as
+         it uses temporary breakpoints to emulate single-stepping.
+

 config GDB_CONSOLE
        bool "Console output to GDB"
        depends on GDBSTUB
 config GDB_CONSOLE
        bool "Console output to GDB"
        depends on GDBSTUB


@@ -142,3 +153,7 @@ config GDBSTUB_ON_TTYSx
        default y
 
 endmenu
        default y
 
 endmenu

+
+config KERNEL_DEBUGGER
+       def_bool y
+       depends on GDBSTUB || KGDB