summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert+renesas@glider.be>2014-10-03 19:11:42 +0400
committerSimon Horman <horms+renesas@verge.net.au>2014-10-24 05:44:10 +0400
commit17323b3615b54bd80ba7e9056c62266e7df24f27 (patch)
treee9174fc672b515c5ec0f6e6f9256cf30fc065cde /arch/arm
parent8590e2d742c1687a733a90edc25ab0178d6a66fc (diff)
downloadlinux-17323b3615b54bd80ba7e9056c62266e7df24f27.tar.xz
ARM: shmobile: koelsch dts: Add chosen/stdout-path
Add a stdout-path property so that automatic console selection works in the absence of a "console=" parameter on the kernel command line. Note that we have to keep the "console=" parameter in chosen/bootargs, as this DTS is shared between legacy and multi-platform. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/boot/dts/r8a7791-koelsch.dts1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/r8a7791-koelsch.dts b/arch/arm/boot/dts/r8a7791-koelsch.dts
index 07550e775e80..9497cc2c51f1 100644
--- a/arch/arm/boot/dts/r8a7791-koelsch.dts
+++ b/arch/arm/boot/dts/r8a7791-koelsch.dts
@@ -26,6 +26,7 @@
chosen {
bootargs = "console=ttySC6,115200 ignore_loglevel rw root=/dev/nfs ip=dhcp";
+ stdout-path = &scif0;
};
memory@40000000 {