From: Geert Uytterhoeven Date: Fri, 3 Oct 2014 15:11:39 +0000 (+0200) Subject: ARM: shmobile: marzen dts: Add chosen/stdout-path X-Git-Tag: v4.14-rc1~6274^2~17^2~14 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1877a35096a3aebd6e848b688f8a50b75882b7e3;p=platform%2Fkernel%2Flinux-rpi.git 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 Signed-off-by: Simon Horman --- diff --git a/arch/arm/boot/dts/r8a7779-marzen.dts b/arch/arm/boot/dts/r8a7779-marzen.dts index c160404..9e1b859 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 {