mirror of
https://github.com/torvalds/linux.git
synced 2024-11-05 03:21:32 +00:00
[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>
This commit is contained in:
parent
869d7f381e
commit
9a2ded55c4
@ -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
|
||||
|
@ -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 */
|
||||
|
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user