summaryrefslogtreecommitdiffstats
path: root/meta-fsl-arm/conf/machine
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
commit28be77f8b7d75ac7ac98d7b6de978feca75fa277 (patch)
tree020aaffc619ef55ed7ea6965fbb543a784da8077 /meta-fsl-arm/conf/machine
parentc80d54755d337454d55e07ef3be14ada9c8e81e5 (diff)
downloadmeta-freescale-28be77f8b7d75ac7ac98d7b6de978feca75fa277.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>
Diffstat (limited to 'meta-fsl-arm/conf/machine')
-rw-r--r--meta-fsl-arm/conf/machine/imx6slevk.conf2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta-fsl-arm/conf/machine/imx6slevk.conf b/meta-fsl-arm/conf/machine/imx6slevk.conf
index 533f85a8..9ca57353 100644
--- a/meta-fsl-arm/conf/machine/imx6slevk.conf
+++ b/meta-fsl-arm/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"