Merge master.kernel.org:/home/rmk/linux-2.6-arm

[linux-2.6-omap-h63xx.git] / arch / powerpc / Kconfig.debug

diff --git a/arch/powerpc/Kconfig.debug b/arch/powerpc/Kconfig.debug
index 0baf64ec80d022b9f7f00549014cbb0f9af26365..9254806f70326502f203b13cdcb3f580d7ad9a7d 100644 (file)
--- a/arch/powerpc/Kconfig.debug
+++ b/arch/powerpc/Kconfig.debug
@@ -9,16 +9,6 @@ config DEBUG_STACKOVERFLOW
          This option will cause messages to be printed if free stack space
          drops below a certain limit.
 
-config KPROBES
-       bool "Kprobes"
-       depends on DEBUG_KERNEL && PPC64
-       help
-         Kprobes allows you to trap at almost any kernel address and
-         execute a callback function.  register_kprobe() establishes
-         a probepoint and specifies the callback.  Kprobes is useful
-         for kernel debugging, non-intrusive instrumentation and testing.
-         If in doubt, say "N".
-
 config DEBUG_STACK_USAGE
        bool "Stack utilization instrumentation"
        depends on DEBUG_KERNEL && PPC64
@@ -125,4 +115,46 @@ config PPC_OCP
        depends on IBM_OCP || XILINX_OCP
        default y
 
+choice
+       prompt "Early debugging (dangerous)"
+       bool
+       optional
+       help
+         Enable early debugging. Careful, if you enable debugging for the
+         wrong type of machine your kernel _will not boot_.
+
+config PPC_EARLY_DEBUG_LPAR
+       bool "LPAR HV Console"
+       depends on PPC_PSERIES
+       help
+         Select this to enable early debugging for a machine with a HVC
+         console on vterm 0.
+
+config PPC_EARLY_DEBUG_G5
+       bool "Apple G5"
+       depends on PPC_PMAC64
+       help
+         Select this to enable early debugging for Apple G5 machines.
+
+config PPC_EARLY_DEBUG_RTAS
+       bool "RTAS Panel"
+       depends on PPC_RTAS
+       help
+         Select this to enable early debugging via the RTAS panel.
+
+config PPC_EARLY_DEBUG_MAPLE
+       bool "Maple real mode"
+       depends on PPC_MAPLE
+       help
+         Select this to enable early debugging for Maple.
+
+config PPC_EARLY_DEBUG_ISERIES
+       bool "iSeries HV Console"
+       depends on PPC_ISERIES
+       help
+         Select this to enable early debugging for legacy iSeries. You need
+         to hit "Ctrl-x Ctrl-x" to see the messages on the console.
+
+endchoice
+
 endmenu