summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorOliver O'Halloran <oohall@gmail.com>2018-03-19 16:14:03 +1100
committerMichael Ellerman <mpe@ellerman.id.au>2018-12-22 21:47:23 +1100
commit9bbc7e4ce47ecefa142fcba55eef7754af1b0213 (patch)
treeff5d591aa07952e667621c96bf8f15c7ed464d93 /arch
parent505a314fb28ce122091691c51426fa85c084e115 (diff)
downloadlinux-9bbc7e4ce47ecefa142fcba55eef7754af1b0213.tar.bz2
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>
Diffstat (limited to 'arch')
-rw-r--r--arch/powerpc/boot/serial.c3
1 files changed, 2 insertions, 1 deletions
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;