openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

[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:
Michael Neuling 2006-08-16 23:12:14 -05:00 committed by Paul Mackerras
parent 869d7f381e
commit 9a2ded55c4
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/powerpc/Kconfig
View File

@ -426,7 +426,8 @@ config PPC_IBM_CELL_BLADE
select UDBG_RTAS_CONSOLE select UDBG_RTAS_CONSOLE
config UDBG_RTAS_CONSOLE config UDBG_RTAS_CONSOLE
bool bool "RTAS based debug console"
depends on PPC_RTAS
default n default n
config XICS config XICS

5
arch/powerpc/kernel/rtas.c
View File

@ -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); basep = of_get_flat_dt_prop(node, "get-term-char", NULL);
if (basep) if (basep)
rtas_getchar_token = *basep; rtas_getchar_token = *basep;
if (rtas_putchar_token != RTAS_UNKNOWN_SERVICE &&
rtas_getchar_token != RTAS_UNKNOWN_SERVICE)
udbg_init_rtas_console();
#endif #endif
/* break now */ /* break now */

4
arch/powerpc/platforms/cell/setup.c
View File

@ -150,10 +150,6 @@ static int __init cell_probe(void)
!of_flat_dt_is_compatible(root, "IBM,CPBW-1.0")) !of_flat_dt_is_compatible(root, "IBM,CPBW-1.0"))
return 0; return 0;
#ifdef CONFIG_UDBG_RTAS_CONSOLE
udbg_init_rtas_console();
#endif
hpte_init_native(); hpte_init_native();
return 1; return 1;