diff options
| author | Stewart Smith <stewart@linux.vnet.ibm.com> | 2018-03-06 21:23:16 -0600 |
|---|---|---|
| committer | Stewart Smith <stewart@linux.vnet.ibm.com> | 2018-03-06 21:24:10 -0600 |
| commit | 217f74b0c40e176917f604e0b3d40fb44598f07c (patch) | |
| tree | eae3b5c464d52ef52a5c37c4f27a4be4bce63e7a /hw/fsp | |
| parent | b1190f403248a428cdbe0538fc55faf023b9b8ee (diff) | |
| download | skiboot-217f74b0c40e176917f604e0b3d40fb44598f07c.zip skiboot-217f74b0c40e176917f604e0b3d40fb44598f07c.tar.gz skiboot-217f74b0c40e176917f604e0b3d40fb44598f07c.tar.bz2 | |
Revert "console(lpc/fsp-console): Use only stdout-path property on P9 and above"
This reverts commit 20f685a3627a2a522c465716377561a8fbcc608f.
We've hit problems on Zaius machines and the needed petitboot changes
haven't made it upstream yet.
Let's revert for the time being while we sort everything out.
We probably have to keep both around for a few years.
Signed-off-by: Stewart Smith <stewart@linux.vnet.ibm.com>
Diffstat (limited to 'hw/fsp')
| -rw-r--r-- | hw/fsp/fsp-console.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/hw/fsp/fsp-console.c b/hw/fsp/fsp-console.c index fc092ce..8d845d8 100644 --- a/hw/fsp/fsp-console.c +++ b/hw/fsp/fsp-console.c @@ -1,4 +1,4 @@ -/* Copyright 2013-2018 IBM Corp. +/* Copyright 2013-2014 IBM Corp. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -1072,22 +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) { - if (proc_gen < proc_gen_p9) - dt_add_property_string(dt_chosen, "linux,stdout-path", - "/ibm,opal/consoles/serial@1"); - dt_add_property_string(dt_chosen, "stdout-path", + dt_add_property_string(dt_chosen, "linux,stdout-path", "/ibm,opal/consoles/serial@1"); prlog(PR_NOTICE, "FSPCON: default console set to serial A\n"); } else { - 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, "stdout-path", + dt_add_property_string(dt_chosen, "linux,stdout-path", "/ibm,opal/consoles/serial@0"); prlog(PR_NOTICE, "FSPCON: default console set to SOL/DVS\n"); } |