summaryrefslogtreecommitdiffstats
path: root/arch/arm/boot
diff options
context:
space:
mode:
authorAlexandre Belloni <alexandre.belloni@free-electrons.com>2015-06-03 14:24:11 +0200
committerNicolas Ferre <nicolas.ferre@atmel.com>2015-06-04 10:00:38 +0200
commit7cb5852d9ca8201dbf7cefdc54f0c813c423abff (patch)
tree6647eaf53be8ec1b40b20589b3c46dd19827c5f9 /arch/arm/boot
parentARM: at91/dt: at91sam9m10g45ek use stdout-path (diff)
downloadlinux-7cb5852d9ca8201dbf7cefdc54f0c813c423abff.tar.xz
linux-7cb5852d9ca8201dbf7cefdc54f0c813c423abff.zip
ARM: at91/dt: at91sam9n12ek: use stdout-path
Use stdout-path to specify the console and remove the console argument from the kernel command line. Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Diffstat (limited to 'arch/arm/boot')
-rw-r--r--arch/arm/boot/dts/at91sam9n12ek.dts3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/at91sam9n12ek.dts b/arch/arm/boot/dts/at91sam9n12ek.dts
index 6e067c8a3502..eab17fcace6d 100644
--- a/arch/arm/boot/dts/at91sam9n12ek.dts
+++ b/arch/arm/boot/dts/at91sam9n12ek.dts
@@ -14,7 +14,8 @@
compatible = "atmel,at91sam9n12ek", "atmel,at91sam9n12", "atmel,at91sam9";
chosen {
- bootargs = "console=ttyS0,115200 root=/dev/mtdblock1 rw rootfstype=jffs2";
+ bootargs = "root=/dev/mtdblock1 rw rootfstype=jffs2";
+ stdout-path = "serial0:115200n8";
};
memory {