summaryrefslogtreecommitdiff
path: root/arch/arm/boot
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert+renesas@glider.be>2014-10-06 13:59:13 +0200
committerSimon Horman <horms+renesas@verge.net.au>2014-10-24 10:44:10 +0900
commit120f038cf04b95dc895cba503a7516ff75561438 (patch)
treecd6da0c47c8a05140d191cd8fc662fad7fa7934f /arch/arm/boot
parent59ab5bff23020b6223857a460a39b9ec71d91cea (diff)
ARM: shmobile: kzm9d 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=ttyS1,115200n81" parameter in chosen/bootargs, else the console will use the default setting of 9600 baud. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Diffstat (limited to 'arch/arm/boot')
-rw-r--r--arch/arm/boot/dts/emev2-kzm9d.dts1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/emev2-kzm9d.dts b/arch/arm/boot/dts/emev2-kzm9d.dts
index a1794cbd23fe..667d323e80a3 100644
--- a/arch/arm/boot/dts/emev2-kzm9d.dts
+++ b/arch/arm/boot/dts/emev2-kzm9d.dts
@@ -25,6 +25,7 @@
chosen {
bootargs = "console=ttyS1,115200n81 ignore_loglevel root=/dev/nfs ip=dhcp";
+ stdout-path = &uart1;
};
gpio_keys {