linuxppc-dev.lists.ozlabs.org archive mirror
 help / color / mirror / Atom feed
From: Oliver O'Halloran <oohall@gmail.com>
To: linuxppc-dev@lists.ozlabs.org
Cc: Oliver O'Halloran <oohall@gmail.com>
Subject: [PATCH 5/5] powerpc/zImage: Also check for stdout-path
Date: Mon, 19 Mar 2018 16:14:03 +1100	[thread overview]
Message-ID: <20180319051403.23275-5-oohall@gmail.com> (raw)
In-Reply-To: <20180319051403.23275-1-oohall@gmail.com>

The /chosen/linux,stdout-path is "deprecated" in favour of
/chosen/stdout-path so we should be checking for both.

Signed-off-by: Oliver O'Halloran <oohall@gmail.com>
---
 arch/powerpc/boot/serial.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/powerpc/boot/serial.c b/arch/powerpc/boot/serial.c
index a7f9ac9a27b5..9ef1ed35ae62 100644
--- a/arch/powerpc/boot/serial.c
+++ b/arch/powerpc/boot/serial.c
@@ -92,7 +92,8 @@ static void *serial_get_stdout_devp(void)
 	if (devp == NULL)
 		goto err_out;
 
-	if (getprop(devp, "linux,stdout-path", path, MAX_PATH_LEN) > 0) {
+	if (getprop(devp, "linux,stdout-path", path, MAX_PATH_LEN) > 0 ||
+		getprop(devp, "stdout-path", path, MAX_PATH_LEN) > 0) {
 		devp = finddevice(path);
 		if (devp == NULL)
 			goto err_out;
-- 
2.9.5

  parent reply	other threads:[~2018-03-19  5:15 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-03-19  5:13 [PATCH 1/5] powerpc/zImage: Remove #ifdef in opal.c Oliver O'Halloran
2018-03-19  5:14 ` [PATCH 2/5] powerpc/zImage: Don't build zlib object files Oliver O'Halloran
2018-03-19  5:14 ` [PATCH 3/5] powerpc/zImage: Check compatible at driver init Oliver O'Halloran
2018-03-20  9:19   ` Michael Ellerman
2018-03-20 12:56     ` Oliver
2018-03-19  5:14 ` [PATCH 4/5] powerpc/zImage: Rework serial driver probing Oliver O'Halloran
2018-03-20  7:50   ` kbuild test robot
2018-03-20  8:04   ` kbuild test robot
2018-03-20  9:20   ` Michael Ellerman
2018-03-20 13:05     ` Oliver
2018-03-19  5:14 ` Oliver O'Halloran [this message]
2018-12-23 13:28   ` [5/5] powerpc/zImage: Also check for stdout-path Michael Ellerman

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180319051403.23275-5-oohall@gmail.com \
    --to=oohall@gmail.com \
    --cc=linuxppc-dev@lists.ozlabs.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).