summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLauren Post <lauren.post@freescale.com>2015-01-21 08:44:41 -0600
committerOtavio Salvador <otavio@ossystems.com.br>2015-01-27 09:10:44 -0200
commit0910895b8f132d89ba5f1d91c8d4547fa257b4a4 (patch)
tree5da1b5661c6191d8e023e4a1cc4f8fa2f2e6f99e
parent505eecf41ce8ac1b78a5127f14781931547f3a11 (diff)
downloadmeta-fsl-arm-0910895b8f132d89ba5f1d91c8d4547fa257b4a4.tar.gz
imx6slevk: Add new uart device tree imx6sl-evk-uart.dtb
Add uart4 DCE and DTE pinctrl set because of pin conflict. DTE pinctrl set is commented out but can be enabled in dts file. If user want to test DTE mode, it needs to rebuild the DTB file. Signed-off-by: Lauren Post <lauren.post@freescale.com> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
-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 533f85a..9ca5735 100644
--- a/conf/machine/imx6slevk.conf
+++ b/conf/machine/imx6slevk.conf
@@ -10,7 +10,7 @@ include conf/machine/include/tune-cortexa9.inc
10SOC_FAMILY = "mx6:mx6sl" 10SOC_FAMILY = "mx6:mx6sl"
11 11
12KERNEL_DEVICETREE = "imx6sl-evk.dtb imx6sl-evk-csi.dtb imx6sl-evk-ldo.dtb \ 12KERNEL_DEVICETREE = "imx6sl-evk.dtb imx6sl-evk-csi.dtb imx6sl-evk-ldo.dtb \
13 imx6sl-evk-pf200.dtb" 13 imx6sl-evk-pf200.dtb imx6sl-evk-uart.dtb"
14 14
15UBOOT_CONFIG ??= "sd" 15UBOOT_CONFIG ??= "sd"
16UBOOT_CONFIG[sd] = "mx6slevk_config,sdcard" 16UBOOT_CONFIG[sd] = "mx6slevk_config,sdcard"