aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorLuka Perkov <luka@openwrt.org>2013-07-15 00:03:40 +0000
committerLuka Perkov <luka@openwrt.org>2013-07-15 00:03:40 +0000
commit75b911ddc15ecf4f11a7cb537488d7349d99c313 (patch)
tree1242dfba0e2e1a90ec9bc34eebc0b593852ed5d3 /target/linux
parent9e3eee974bd919e9960543795aeac27e9c6623b0 (diff)
downloadupstream-75b911ddc15ecf4f11a7cb537488d7349d99c313.tar.gz
upstream-75b911ddc15ecf4f11a7cb537488d7349d99c313.tar.bz2
upstream-75b911ddc15ecf4f11a7cb537488d7349d99c313.zip
imx6: switch to askconsole
Signed-off-by: Luka Perkov <luka@openwrt.org> SVN-Revision: 37326
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/imx6/base-files/etc/inittab2
-rw-r--r--target/linux/imx6/patches-3.10/100-bootargs.patch13
2 files changed, 14 insertions, 1 deletions
diff --git a/target/linux/imx6/base-files/etc/inittab b/target/linux/imx6/base-files/etc/inittab
index 16521ca4cf..7817185937 100644
--- a/target/linux/imx6/base-files/etc/inittab
+++ b/target/linux/imx6/base-files/etc/inittab
@@ -1,3 +1,3 @@
::sysinit:/etc/init.d/rcS S boot
::shutdown:/etc/init.d/rcS K shutdown
-ttymxc0::askfirst:/bin/ash --login
+::askconsole:/bin/ash --login
diff --git a/target/linux/imx6/patches-3.10/100-bootargs.patch b/target/linux/imx6/patches-3.10/100-bootargs.patch
new file mode 100644
index 0000000000..c10f64b38d
--- /dev/null
+++ b/target/linux/imx6/patches-3.10/100-bootargs.patch
@@ -0,0 +1,13 @@
+--- a/arch/arm/boot/dts/imx6dl-wandboard.dts
++++ b/arch/arm/boot/dts/imx6dl-wandboard.dts
+@@ -18,6 +18,10 @@
+ memory {
+ reg = <0x10000000 0x40000000>;
+ };
++
++ chosen {
++ bootargs = "console=ttymxc0,115200";
++ };
+ };
+
+ &fec {