Merge pull request #4392 from vpeter4/udoodt

projects/imx6/patches/linux: udoo dt - serial console on ttymxc0
This commit is contained in:
Lukas Rusak 2015-10-23 11:16:57 -07:00
commit 7f700f9c33
2 changed files with 9 additions and 7 deletions

View File

@ -5,14 +5,14 @@ video=mxcfb0:dev=hdmi,1920x1080M@60,if=RGB24,bpp=32
# 7" LVDS
#video=mxcfb0:dev=ldb,800x480M@60,if=RGB666,bpp=32
# 15.6" LVDS
#video=mxcfb0:dev=ldb,1368x768M@60,if=RGB24,bpp=32
#video=mxcfb0:dev=ldb,1366x768M@60,if=RGB24,bpp=32
# enable serial console
#console_arg=console=ttymxc1,115200
# or make boot more quiet
# make boot more quiet
console_arg=quiet morequiet
# or having quiet console
#console_arg=console=ttymxc1,115200 quiet morequiet
# or having quiet and console
#console_arg=console=ttymxc0,115200 quiet morequiet
# show messages too
#console_arg=console=ttymxc0,115200 no_console_suspend=1
# enable ssh
#ssh_arg=ssh

View File

@ -145,7 +145,7 @@ new file mode 100644
index 0000000..f9ce5ca
--- /dev/null
+++ b/arch/arm/boot/dts/imx6qdl-udoo.dtsi
@@ -0,0 +1,443 @@
@@ -0,0 +1,445 @@
+/*
+ * Copyright 2013 Freescale Semiconductor, Inc.
+ *
@ -172,6 +172,8 @@ index 0000000..f9ce5ca
+ mxcfb2 = &mxcfb3;
+ mxcfb3 = &mxcfb4;
+ ssi0 = &ssi1;
+ serial0 = &uart2; // console on ttymxc0
+ serial1 = &uart1;
+ };
+
+ memory {