summaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
authorLauren Post <lauren.post@freescale.com>2013-12-16 10:48:07 -0600
committerOtavio Salvador <otavio@ossystems.com.br>2014-03-03 15:01:53 -0300
commit1d73eae487c045556c0dc62973548129d5797225 (patch)
treee3e288b15f2ad780bd90ef3ddd2a02f2e671b2f9 /conf
parentec2a08b91f21ea8906d9c7c83ffd174c840b705c (diff)
downloadmeta-fsl-arm-1d73eae487c045556c0dc62973548129d5797225.tar.gz
imx6slevk: Add new device tree imx6sl-evk-csi.dtb
3.10.17-1.0.0-beta changed the imx6sl-evk.dts file to work with EPDC but as a consequence it breaks CSI function as its pins are shared. A new imx6sl-evk-csi.dts file has been add to allow use of CSI in case it is desired. Signed-off-by: Lauren Post <lauren.post@freescale.com> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Diffstat (limited to 'conf')
-rw-r--r--conf/machine/imx6slevk.conf2
1 files changed, 1 insertions, 1 deletions
diff --git a/conf/machine/imx6slevk.conf b/conf/machine/imx6slevk.conf
index 8162b44..5c3d2fa 100644
--- a/conf/machine/imx6slevk.conf
+++ b/conf/machine/imx6slevk.conf
@@ -9,7 +9,7 @@ include conf/machine/include/tune-cortexa9.inc
9 9
10SOC_FAMILY = "mx6:mx6sl" 10SOC_FAMILY = "mx6:mx6sl"
11 11
12KERNEL_DEVICETREE = "imx6sl-evk.dtb imx6sl-evk-ldo.dtb" 12KERNEL_DEVICETREE = "imx6sl-evk.dtb imx6sl-evk-csi.dtb imx6sl-evk-ldo.dtb"
13 13
14UBOOT_MACHINE = "mx6slevk_config" 14UBOOT_MACHINE = "mx6slevk_config"
15 15