diff options
author | Alistair Popple <alistair@popple.id.au> | 2013-04-28 23:42:43 -0400 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2013-06-20 02:55:12 -0400 |
commit | 071df9422ac91c0d290e81f5ae2635c74cda6d00 (patch) | |
tree | e76ebd76c38500f79037734ee776b9d6dee8658b | |
parent | 0962e8004e97409072bb6caee7b3ba948a5fb93a (diff) |
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>
-rw-r--r-- | arch/powerpc/Kconfig.debug | 7 | ||||
-rw-r--r-- | arch/powerpc/kernel/udbg.c | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/arch/powerpc/Kconfig.debug b/arch/powerpc/Kconfig.debug index 863d877e0b5f..d86875f3e17e 100644 --- a/arch/powerpc/Kconfig.debug +++ b/arch/powerpc/Kconfig.debug | |||
@@ -147,6 +147,13 @@ choice | |||
147 | enable debugging for the wrong type of machine your kernel | 147 | enable debugging for the wrong type of machine your kernel |
148 | _will not boot_. | 148 | _will not boot_. |
149 | 149 | ||
150 | config PPC_EARLY_DEBUG_BOOTX | ||
151 | bool "BootX or OpenFirmware" | ||
152 | depends on BOOTX_TEXT | ||
153 | help | ||
154 | Select this to enable early debugging for a machine using BootX | ||
155 | or OpenFirmware. | ||
156 | |||
150 | config PPC_EARLY_DEBUG_LPAR | 157 | config PPC_EARLY_DEBUG_LPAR |
151 | bool "LPAR HV Console" | 158 | bool "LPAR HV Console" |
152 | depends on PPC_PSERIES | 159 | depends on PPC_PSERIES |
diff --git a/arch/powerpc/kernel/udbg.c b/arch/powerpc/kernel/udbg.c index 9d3fdcd66290..a15837519dca 100644 --- a/arch/powerpc/kernel/udbg.c +++ b/arch/powerpc/kernel/udbg.c | |||
@@ -50,7 +50,7 @@ void __init udbg_early_init(void) | |||
50 | udbg_init_debug_beat(); | 50 | udbg_init_debug_beat(); |
51 | #elif defined(CONFIG_PPC_EARLY_DEBUG_PAS_REALMODE) | 51 | #elif defined(CONFIG_PPC_EARLY_DEBUG_PAS_REALMODE) |
52 | udbg_init_pas_realmode(); | 52 | udbg_init_pas_realmode(); |
53 | #elif defined(CONFIG_BOOTX_TEXT) | 53 | #elif defined(CONFIG_PPC_EARLY_DEBUG_BOOTX) |
54 | udbg_init_btext(); | 54 | udbg_init_btext(); |
55 | #elif defined(CONFIG_PPC_EARLY_DEBUG_44x) | 55 | #elif defined(CONFIG_PPC_EARLY_DEBUG_44x) |
56 | /* PPC44x debug */ | 56 | /* PPC44x debug */ |