From mboxrd@z Thu Jan 1 00:00:00 1970 From: Geert Uytterhoeven Date: Fri, 03 Oct 2014 15:11:34 +0000 Subject: [PATCH v2 03/13] ARM: shmobile: kzm9d dts: Add chosen/stdout-path Message-Id: <1412349104-18724-4-git-send-email-geert+renesas@glider.be> List-Id: References: <1412349104-18724-1-git-send-email-geert+renesas@glider.be> In-Reply-To: <1412349104-18724-1-git-send-email-geert+renesas@glider.be> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Simon Horman , Magnus Damm Cc: linux-sh@vger.kernel.org, devicetree@vger.kernel.org, Geert Uytterhoeven 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 --- v2: - No changes --- arch/arm/boot/dts/emev2-kzm9d.dts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/emev2-kzm9d.dts b/arch/arm/boot/dts/emev2-kzm9d.dts index a1794cbd23fee319..d01baba9e56f7781 100644 --- a/arch/arm/boot/dts/emev2-kzm9d.dts +++ b/arch/arm/boot/dts/emev2-kzm9d.dts @@ -24,7 +24,8 @@ }; chosen { - bootargs = "console=ttyS1,115200n81 ignore_loglevel root=/dev/nfs ip=dhcp"; + bootargs = "ignore_loglevel root=/dev/nfs ip=dhcp"; + stdout-path = &uart1; }; gpio_keys { -- 1.9.1