From: Oliver O'Halloran <oohall@gmail.com>
Date: Mon, 19 Mar 2018 05:14:03 +0000 (+1100)
Subject: powerpc/zImage: Also check for stdout-path
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=9bbc7e4ce47ecefa142fcba55eef7754af1b0213;p=openwrt%2Fstaging%2Fblogic.git

powerpc/zImage: Also check for stdout-path

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>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
---

diff --git a/arch/powerpc/boot/serial.c b/arch/powerpc/boot/serial.c
index f045f8494bf9..b0491b8c0199 100644
--- a/arch/powerpc/boot/serial.c
+++ b/arch/powerpc/boot/serial.c
@@ -93,7 +93,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;