aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/imx6
diff options
context:
space:
mode:
authorLuka Perkov <luka@openwrt.org>2013-10-16 03:25:49 +0000
committerLuka Perkov <luka@openwrt.org>2013-10-16 03:25:49 +0000
commit89c72aeb452600b8f6c3b9b571af7f06290a51b8 (patch)
tree8a936eea5c41008b8d1eec4e59d1a3f2c9127beb /target/linux/imx6
parent9eb69ef0dc7d3fe0c92d5225ad3d7b5e9672dfec (diff)
downloadupstream-89c72aeb452600b8f6c3b9b571af7f06290a51b8.tar.gz
upstream-89c72aeb452600b8f6c3b9b571af7f06290a51b8.tar.bz2
upstream-89c72aeb452600b8f6c3b9b571af7f06290a51b8.zip
imx6: add back bootargs
They make our life easier when testing ramdisk images. Signed-off-by: Luka Perkov <luka@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38420 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/imx6')
-rw-r--r--target/linux/imx6/files-3.10/arch/arm/boot/dts/imx6q-gw5400-a.dts4
-rw-r--r--target/linux/imx6/files-3.10/arch/arm/boot/dts/imx6q-gw54xx.dts4
2 files changed, 8 insertions, 0 deletions
diff --git a/target/linux/imx6/files-3.10/arch/arm/boot/dts/imx6q-gw5400-a.dts b/target/linux/imx6/files-3.10/arch/arm/boot/dts/imx6q-gw5400-a.dts
index e22d881834..a027ed9db7 100644
--- a/target/linux/imx6/files-3.10/arch/arm/boot/dts/imx6q-gw5400-a.dts
+++ b/target/linux/imx6/files-3.10/arch/arm/boot/dts/imx6q-gw5400-a.dts
@@ -48,6 +48,10 @@
usdhc3 = &usdhc4;
};
+ chosen {
+ bootargs = "console=ttymxc1,115200";
+ };
+
memory {
reg = <0x10000000 0x40000000>;
};
diff --git a/target/linux/imx6/files-3.10/arch/arm/boot/dts/imx6q-gw54xx.dts b/target/linux/imx6/files-3.10/arch/arm/boot/dts/imx6q-gw54xx.dts
index 21fde1f131..9c2c4471ac 100644
--- a/target/linux/imx6/files-3.10/arch/arm/boot/dts/imx6q-gw54xx.dts
+++ b/target/linux/imx6/files-3.10/arch/arm/boot/dts/imx6q-gw54xx.dts
@@ -50,6 +50,10 @@
usdhc3 = &usdhc4;
};
+ chosen {
+ bootargs = "console=ttymxc1,115200";
+ };
+
memory {
reg = <0x10000000 0x40000000>;
};