Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9a2ded55 authored by Michael Neuling's avatar Michael Neuling Committed by Paul Mackerras
Browse files

[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: default avatarMichael Neuling <mikey@neuling.org>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 869d7f38

arch/powerpc/Kconfig

+2 −1
Original line number Diff line number Diff line
@@ -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

arch/powerpc/kernel/rtas.c

+5 −0
Original line number Diff line number Diff line
@@ -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 */

arch/powerpc/platforms/cell/setup.c

+0 −4
Original line number Diff line number Diff line
@@ -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;