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 /core/console.c | |
| 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 'core/console.c')
| -rw-r--r-- | core/console.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/core/console.c b/core/console.c index d9b48cd..b9129c9 100644 --- a/core/console.c +++ b/core/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. @@ -427,18 +427,16 @@ 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 */ - 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"); - } + p = __dt_find_property(dt_chosen, "linux,stdout-path"); + if (p) + dt_del_property(dt_chosen, p); - dt_add_property_string(dt_chosen, "stdout-path", + dt_add_property_string(dt_chosen, "linux,stdout-path", "/ibm,opal/consoles/serial@0"); opal_add_poller(dummy_console_poll, NULL); |