diff options
| author | Michael Neuling <mikey@neuling.org> | 2006-08-17 06:12:14 +0200 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-08-25 05:27:35 +0200 |
| commit | 9a2ded55c40ad17b8b12f87c592a40b2e8593c4d (patch) | |
| tree | f1fd41f15356787e68915257be26dafb0d951932 /arch | |
| parent | [POWERPC] Allow MPC8641 HPCN to build with CONFIG_PCI disabled too. (diff) | |
| download | linux-9a2ded55c40ad17b8b12f87c592a40b2e8593c4d.tar.xz linux-9a2ded55c40ad17b8b12f87c592a40b2e8593c4d.zip | |
[POWERPC] powerpc: Make RTAS console init generic
The rtas console doesn't have to be Cell specific. If we get both
RTAS tokens, we should just enabled the console then and there.
Signed-off-by: Michael Neuling <mikey@neuling.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/powerpc/Kconfig | 3 | ||||
| -rw-r--r-- | arch/powerpc/kernel/rtas.c | 5 | ||||
| -rw-r--r-- | arch/powerpc/platforms/cell/setup.c | 4 |
3 files changed, 7 insertions, 5 deletions
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index 13e583f16ede..7f782b338e8e 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig @@ -426,7 +426,8 @@ config PPC_IBM_CELL_BLADE select UDBG_RTAS_CONSOLE config UDBG_RTAS_CONSOLE - bool + bool "RTAS based debug console" + depends on PPC_RTAS default n config XICS diff --git a/arch/powerpc/kernel/rtas.c b/arch/powerpc/kernel/rtas.c index bfd66d3a035c..6b0699b82b41 100644 --- a/arch/powerpc/kernel/rtas.c +++ b/arch/powerpc/kernel/rtas.c @@ -910,6 +910,11 @@ int __init early_init_dt_scan_rtas(unsigned long node, basep = of_get_flat_dt_prop(node, "get-term-char", NULL); if (basep) rtas_getchar_token = *basep; + + if (rtas_putchar_token != RTAS_UNKNOWN_SERVICE && + rtas_getchar_token != RTAS_UNKNOWN_SERVICE) + udbg_init_rtas_console(); + #endif /* break now */ diff --git a/arch/powerpc/platforms/cell/setup.c b/arch/powerpc/platforms/cell/setup.c index 282987d6d4a2..22c228a49c33 100644 --- a/arch/powerpc/platforms/cell/setup.c +++ b/arch/powerpc/platforms/cell/setup.c @@ -150,10 +150,6 @@ static int __init cell_probe(void) !of_flat_dt_is_compatible(root, "IBM,CPBW-1.0")) return 0; -#ifdef CONFIG_UDBG_RTAS_CONSOLE - udbg_init_rtas_console(); -#endif - hpte_init_native(); return 1; |