diff options
| author | Pridhiviraj Paidipeddi <ppaidipe@linux.vnet.ibm.com> | 2018-03-01 22:33:19 +0530 |
|---|---|---|
| committer | Stewart Smith <stewart@linux.vnet.ibm.com> | 2018-03-01 20:27:01 -0600 |
| commit | 20f685a3627a2a522c465716377561a8fbcc608f (patch) | |
| tree | a1980c0de43a39ea35db51267d602381f75ff922 /core/console.c | |
| parent | f23240f50653f3404b21e064f80e8c74b095c2ea (diff) | |
| download | skiboot-20f685a3627a2a522c465716377561a8fbcc608f.zip skiboot-20f685a3627a2a522c465716377561a8fbcc608f.tar.gz skiboot-20f685a3627a2a522c465716377561a8fbcc608f.tar.bz2 | |
console(lpc/fsp-console): Use only stdout-path property on P9 and above
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 fix this by using stdout-path property on all the systems
and keep linux,stdout-path only on P8 and before. This property refers to
a node which represents the device to be used for boot console output.
Verified boot on both P8 and P9 systems with new and older kernels.
And also verified dtc warnings got fixed in both P8 and P9.
Signed-off-by: Pridhiviraj Paidipeddi <ppaidipe@linux.vnet.ibm.com>
[stewart: simplify logic]
Signed-off-by: Stewart Smith <stewart@linux.vnet.ibm.com>
Diffstat (limited to 'core/console.c')
| -rw-r--r-- | core/console.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/core/console.c b/core/console.c index b9129c9..d9b48cd 100644 --- a/core/console.c +++ b/core/console.c @@ -1,4 +1,4 @@ -/* Copyright 2013-2014 IBM Corp. +/* Copyright 2013-2018 IBM Corp. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -427,16 +427,18 @@ static void dummy_console_poll(void *data __unused) void dummy_console_add_nodes(void) { - struct dt_property *p; - 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"); - if (p) - dt_del_property(dt_chosen, p); + dt_check_del_prop(dt_chosen, "stdout-path"); + dt_check_del_prop(dt_chosen, "linux,stdout-path"); + + if (proc_gen < proc_gen_p9) { + dt_add_property_string(dt_chosen, "linux,stdout-path", + "/ibm,opal/consoles/serial@0"); + } - dt_add_property_string(dt_chosen, "linux,stdout-path", + dt_add_property_string(dt_chosen, "stdout-path", "/ibm,opal/consoles/serial@0"); opal_add_poller(dummy_console_poll, NULL); |