summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert+renesas@glider.be>2014-10-03 17:11:38 +0200
committerSimon Horman <horms+renesas@verge.net.au>2014-10-24 10:44:09 +0900
commit05988b32e3551ffd23e095b3e409db112bb84809 (patch)
tree1f985fbec8feed71ba8af9ac22dd515dd83ae468
parent2c32622c3f3f9c7e0d3480c1fc0a31a95e04dd91 (diff)
downloadop-kernel-dev-05988b32e3551ffd23e095b3e409db112bb84809.zip
op-kernel-dev-05988b32e3551ffd23e095b3e409db112bb84809.tar.gz
ARM: shmobile: bockw-reference 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. Remove the now-superfluous "console=" parameter from chosen/bootargs. 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/r8a7778-bockw-reference.dts3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/r8a7778-bockw-reference.dts b/arch/arm/boot/dts/r8a7778-bockw-reference.dts
index 3342c74..fba2949 100644
--- a/arch/arm/boot/dts/r8a7778-bockw-reference.dts
+++ b/arch/arm/boot/dts/r8a7778-bockw-reference.dts
@@ -28,7 +28,8 @@
};
chosen {
- bootargs = "console=ttySC0,115200 ignore_loglevel root=/dev/nfs ip=dhcp rw";
+ bootargs = "ignore_loglevel root=/dev/nfs ip=dhcp rw";
+ stdout-path = &scif0;
};
memory {
OpenPOWER on IntegriCloud