diff options
| author |   Oliver O'Halloran <oohall@gmail.com> | 2018-03-19 16:14:03 +1100 |
|---|---|---|
| committer |   Michael Ellerman <mpe@ellerman.id.au> | 2018-12-22 21:47:23 +1100 |
| commit | 9bbc7e4ce47ecefa142fcba55eef7754af1b0213 (patch) | |
| tree | ff5d591aa07952e667621c96bf8f15c7ed464d93 /arch/powerpc/boot/serial.c | |
| parent | powerpc: Fix HMIs on big-endian with CONFIG_RELOCATABLE=y (diff) | |
| download | linux-dev-9bbc7e4ce47ecefa142fcba55eef7754af1b0213.tar.xz linux-dev-9bbc7e4ce47ecefa142fcba55eef7754af1b0213.zip | |
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 '')
| -rw-r--r-- | arch/powerpc/boot/serial.c | 3 |
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; |