aboutsummaryrefslogtreecommitdiff
path: root/core/init.c
diff options
context:
space:
mode:
authorPridhiviraj Paidipeddi <ppaidipe@linux.vnet.ibm.com>2018-03-01 22:33:19 +0530
committerStewart Smith <stewart@linux.vnet.ibm.com>2018-03-01 20:27:01 -0600
commit20f685a3627a2a522c465716377561a8fbcc608f (patch)
treea1980c0de43a39ea35db51267d602381f75ff922 /core/init.c
parentf23240f50653f3404b21e064f80e8c74b095c2ea (diff)
downloadskiboot-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/init.c')
-rw-r--r--core/init.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/core/init.c b/core/init.c
index a60b784..83f42f5 100644
--- a/core/init.c
+++ b/core/init.c
@@ -549,7 +549,10 @@ 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);
+ if (proc_gen >= proc_gen_p9)
+ stdoutp = dt_prop_get_def(dt_chosen, "stdout-path", NULL);
+ else
+ stdoutp = dt_prop_get_def(dt_chosen, "linux,stdout-path", NULL);
prlog(PR_DEBUG, "INIT: stdout-path: %s\n", stdoutp ? stdoutp : "");