powerpc: Add a configuration option for early BootX/OpenFirmware debug

Signed-off-by: Alistair Popple <alistair@popple.id.au>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

diff --git a/arch/powerpc/Kconfig.debug b/arch/powerpc/Kconfig.debug
index 863d877e0b5f7444f31239a2412bdec68165abea..d86875f3e17e2a66a39a3ca3983ccae5b5ffa987 100644 (file)
--- a/arch/powerpc/Kconfig.debug
+++ b/arch/powerpc/Kconfig.debug
@@ -147,6 +147,13 @@ choice
          enable debugging for the wrong type of machine your kernel
          _will not boot_.
 
+config PPC_EARLY_DEBUG_BOOTX
+       bool "BootX or OpenFirmware"
+       depends on BOOTX_TEXT
+       help
+         Select this to enable early debugging for a machine using BootX
+         or OpenFirmware.
+
 config PPC_EARLY_DEBUG_LPAR
        bool "LPAR HV Console"
        depends on PPC_PSERIES

diff --git a/arch/powerpc/kernel/udbg.c b/arch/powerpc/kernel/udbg.c
index 9d3fdcd66290b79c6200cd853a04eea73be1a3d0..a15837519dca45474a141fc6328eee130bafd779 100644 (file)
--- a/arch/powerpc/kernel/udbg.c
+++ b/arch/powerpc/kernel/udbg.c
@@ -50,7 +50,7 @@ void __init udbg_early_init(void)
        udbg_init_debug_beat();
 #elif defined(CONFIG_PPC_EARLY_DEBUG_PAS_REALMODE)
        udbg_init_pas_realmode();
-#elif defined(CONFIG_BOOTX_TEXT)
+#elif defined(CONFIG_PPC_EARLY_DEBUG_BOOTX)
        udbg_init_btext();
 #elif defined(CONFIG_PPC_EARLY_DEBUG_44x)
        /* PPC44x debug */