From 6162bfd28f3bbb36eb70f39fa691ae625c22a04c Mon Sep 17 00:00:00 2001
From: Michael Neuling <mikey@neuling.org>
Date: Wed, 16 Aug 2006 23:12:14 -0500
Subject: [PATCH] --- yaml --- r: 34083 b: refs/heads/master c:
 9a2ded55c40ad17b8b12f87c592a40b2e8593c4d h: refs/heads/master i:   34081:
 9ae68784794ef9101537d46fdbe8c6c4ebae5562   34079:
 e332790446b48bd9e9062a9f1613ed1cfce91c37 v: v3

---
 [refs]                                    | 2 +-
 trunk/arch/powerpc/Kconfig                | 3 ++-
 trunk/arch/powerpc/kernel/rtas.c          | 5 +++++
 trunk/arch/powerpc/platforms/cell/setup.c | 4 ----
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index c47741b8ceb7..89eaf4f50248 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 869d7f381e8c32de85ddfa9621125fb10a885f87
+refs/heads/master: 9a2ded55c40ad17b8b12f87c592a40b2e8593c4d
diff --git a/trunk/arch/powerpc/Kconfig b/trunk/arch/powerpc/Kconfig
index 13e583f16ede..7f782b338e8e 100644
--- a/trunk/arch/powerpc/Kconfig
+++ b/trunk/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/trunk/arch/powerpc/kernel/rtas.c b/trunk/arch/powerpc/kernel/rtas.c
index bfd66d3a035c..6b0699b82b41 100644
--- a/trunk/arch/powerpc/kernel/rtas.c
+++ b/trunk/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/trunk/arch/powerpc/platforms/cell/setup.c b/trunk/arch/powerpc/platforms/cell/setup.c
index 282987d6d4a2..22c228a49c33 100644
--- a/trunk/arch/powerpc/platforms/cell/setup.c
+++ b/trunk/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;