[Skiboot] [PATCH] console(lpc/fsp-console): Use just stdout-path.

Pridhiviraj Paidipeddi ppaidipe at linux.vnet.ibm.com
Thu Mar 1 17:03:11 AEDT 2018


dtc tool complaining about below warning as usage of linux,stdout-path
property under /chosen node is deprecated.

dts: Warning
(chosen_node_stdout_path): Use 'stdout-path' instead of 'linux,stdout-path'

So this patch will fix this by using just stdout-path property for specifying
to the node which represents the device to be used for boot console output.

Signed-off-by: Pridhiviraj Paidipeddi <ppaidipe at linux.vnet.ibm.com>
---
 core/console.c       | 4 ++--
 core/init.c          | 2 +-
 hw/fsp/fsp-console.c | 6 +++---
 hw/lpc-uart.c        | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/core/console.c b/core/console.c
index b9129c9..f36b71d 100644
--- a/core/console.c
+++ b/core/console.c
@@ -432,11 +432,11 @@ void dummy_console_add_nodes(void)
 	add_opal_console_node(0, "raw", memcons.obuf_size);
 
 	/* Mambo might have left a crap one, clear it */
-	p = __dt_find_property(dt_chosen, "linux,stdout-path");
+	p = __dt_find_property(dt_chosen, "stdout-path");
 	if (p)
 		dt_del_property(dt_chosen, p);
 
-	dt_add_property_string(dt_chosen, "linux,stdout-path",
+	dt_add_property_string(dt_chosen, "stdout-path",
 			       "/ibm,opal/consoles/serial at 0");
 
 	opal_add_poller(dummy_console_poll, NULL);
diff --git a/core/init.c b/core/init.c
index 1d6ce70..dabf011 100644
--- a/core/init.c
+++ b/core/init.c
@@ -549,7 +549,7 @@ void __noreturn load_and_boot_kernel(bool is_reboot)
 	cpu_set_ipi_enable(false);
 
 	/* Dump the selected console */
-	stdoutp = dt_prop_get_def(dt_chosen, "linux,stdout-path", NULL);
+	stdoutp = dt_prop_get_def(dt_chosen, "stdout-path", NULL);
 	prlog(PR_DEBUG, "INIT: stdout-path: %s\n", stdoutp ? stdoutp : "");
 
 
diff --git a/hw/fsp/fsp-console.c b/hw/fsp/fsp-console.c
index 8d845d8..bfe3e47 100644
--- a/hw/fsp/fsp-console.c
+++ b/hw/fsp/fsp-console.c
@@ -1072,14 +1072,14 @@ void fsp_console_select_stdout(void)
 			 */
 		}
 	}
-	dt_check_del_prop(dt_chosen, "linux,stdout-path");
+	dt_check_del_prop(dt_chosen, "stdout-path");
 
 	if (fsp_serials[1].open && use_serial) {
-		dt_add_property_string(dt_chosen, "linux,stdout-path",
+		dt_add_property_string(dt_chosen, "stdout-path",
 				       "/ibm,opal/consoles/serial at 1");
 		prlog(PR_NOTICE, "FSPCON: default console set to serial A\n");
 	} else {
-		dt_add_property_string(dt_chosen, "linux,stdout-path",
+		dt_add_property_string(dt_chosen, "stdout-path",
 				       "/ibm,opal/consoles/serial at 0");
 		prlog(PR_NOTICE, "FSPCON: default console set to SOL/DVS\n");
 	}
diff --git a/hw/lpc-uart.c b/hw/lpc-uart.c
index 3224de9..8f9a237 100644
--- a/hw/lpc-uart.c
+++ b/hw/lpc-uart.c
@@ -438,7 +438,7 @@ static void uart_setup_os_passthrough(void)
 
 	dt_add_property_strings(uart_node, "status", "ok");
 	path = dt_get_path(uart_node);
-	dt_add_property_string(dt_chosen, "linux,stdout-path", path);
+	dt_add_property_string(dt_chosen, "stdout-path", path);
 	free(path);
 
 	/* Setup LPC client for OS interrupts */
@@ -460,7 +460,7 @@ static void uart_setup_opal_console(void)
 	/* Add the opal console node */
 	add_opal_console_node(0, "raw", OUT_BUF_SIZE);
 
-	dt_add_property_string(dt_chosen, "linux,stdout-path",
+	dt_add_property_string(dt_chosen, "stdout-path",
 			       "/ibm,opal/consoles/serial at 0");
 
 	/*
-- 
2.7.4



More information about the Skiboot mailing list