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 f045f8494bf91b464df2a9d5778e96e0b2010581..b0491b8c0199daa4542d81e32d142c279f75164f 100644 (file)
--- 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;