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 | |
| parent | b1190f403248a428cdbe0538fc55faf023b9b8ee (diff) | |
| download | talos-skiboot-217f74b0c40e176917f604e0b3d40fb44598f07c.tar.gz talos-skiboot-217f74b0c40e176917f604e0b3d40fb44598f07c.zip | |
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')
| -rw-r--r-- | hw/fsp/fsp-console.c | 14 | ||||
| -rw-r--r-- | hw/lpc-uart.c | 14 |
2 files changed, 6 insertions, 22 deletions
diff --git a/hw/fsp/fsp-console.c b/hw/fsp/fsp-console.c index fc092ce6..8d845d83 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"); } diff --git a/hw/lpc-uart.c b/hw/lpc-uart.c index ea71ac5c..3224de9f 100644 --- a/hw/lpc-uart.c +++ b/hw/lpc-uart.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. @@ -438,12 +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, "stdout-path", path); - if (proc_gen < proc_gen_p9) - dt_add_property_string(dt_chosen, "linux,stdout-path", path); - + dt_add_property_string(dt_chosen, "linux,stdout-path", path); free(path); /* Setup LPC client for OS interrupts */ @@ -465,11 +460,8 @@ 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, "stdout-path", + dt_add_property_string(dt_chosen, "linux,stdout-path", "/ibm,opal/consoles/serial@0"); - if (proc_gen < proc_gen_p9) - dt_add_property_string(dt_chosen, "linux,stdout-path", - "/ibm,opal/consoles/serial@0"); /* * We mark the UART as reserved since we don't want the |
