summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert+renesas@glider.be>2014-10-03 17:11:39 +0200
committerSimon Horman <horms+renesas@verge.net.au>2014-10-24 10:44:09 +0900
commit1877a35096a3aebd6e848b688f8a50b75882b7e3 (patch)
tree20e9a9432eacd30ab16a9a618643f5504a75f0c0
parent05988b32e3551ffd23e095b3e409db112bb84809 (diff)
downloadblackbird-op-linux-1877a35096a3aebd6e848b688f8a50b75882b7e3.tar.gz
blackbird-op-linux-1877a35096a3aebd6e848b688f8a50b75882b7e3.zip
ARM: shmobile: marzen 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>
-rw-r--r--arch/arm/boot/dts/r8a7779-marzen.dts1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/r8a7779-marzen.dts b/arch/arm/boot/dts/r8a7779-marzen.dts
index c160404e4d40..9e1b859190ca 100644
--- a/arch/arm/boot/dts/r8a7779-marzen.dts
+++ b/arch/arm/boot/dts/r8a7779-marzen.dts
@@ -25,6 +25,7 @@
chosen {
bootargs = "console=ttySC2,115200 ignore_loglevel root=/dev/nfs ip=on";
+ stdout-path = &scif2;
};
memory {
OpenPOWER on IntegriCloud