linux 2.6.16.38 w/ vs2.0.3-rc1

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

diff --git a/arch/powerpc/Kconfig.debug b/arch/powerpc/Kconfig.debug
index e29ef77..9254806 100644 (file)
--- a/arch/powerpc/Kconfig.debug
+++ b/arch/powerpc/Kconfig.debug
@@ -110,16 +110,18 @@ config SERIAL_TEXT_DEBUG
        depends on 4xx || LOPEC || MV64X60 || PPLUS || PRPMC800 || \
                PPC_GEN550 || PPC_MPC52xx
 
-config PPC_EARLY_DEBUG
-       bool "Early debugging (dangerous)"
+config PPC_OCP
+       bool
+       depends on IBM_OCP || XILINX_OCP
+       default y
 
 choice
-       prompt "Early debugging console"
-       depends on PPC_EARLY_DEBUG
+       prompt "Early debugging (dangerous)"
+       bool
+       optional
        help
-         Use the selected console for early debugging. Careful, if you
-         enable debugging for the wrong type of machine your kernel
-         _will not boot_.
+         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"
@@ -134,19 +136,12 @@ config PPC_EARLY_DEBUG_G5
        help
          Select this to enable early debugging for Apple G5 machines.
 
-config PPC_EARLY_DEBUG_RTAS_PANEL
+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_RTAS_CONSOLE
-       bool "RTAS Console"
-       depends on PPC_RTAS
-       select UDBG_RTAS_CONSOLE
-       help
-         Select this to enable early debugging via the RTAS console.
-
 config PPC_EARLY_DEBUG_MAPLE
        bool "Maple real mode"
        depends on PPC_MAPLE