From dc85122121c15ff3fac5286ee2856375768bca60 Mon Sep 17 00:00:00 2001 From: Lauren Post Date: Wed, 21 Jan 2015 08:44:42 -0600 Subject: [PATCH] imx6qsabresd.conf: Add imx6q-sabresd-uart device tree Add uart5 DTE mode pinctrl set for imx6q-sabresd board becuase of pin conflict. Signed-off-by: Lauren Post Signed-off-by: Otavio Salvador --- meta-fsl-arm/conf/machine/imx6qsabresd.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-fsl-arm/conf/machine/imx6qsabresd.conf b/meta-fsl-arm/conf/machine/imx6qsabresd.conf index 02b7cdc7..72d1da5d 100644 --- a/meta-fsl-arm/conf/machine/imx6qsabresd.conf +++ b/meta-fsl-arm/conf/machine/imx6qsabresd.conf @@ -9,7 +9,7 @@ require conf/machine/include/imx6sabresd-common.inc SOC_FAMILY = "mx6:mx6q" KERNEL_DEVICETREE = "imx6q-sabresd.dtb imx6q-sabresd-ldo.dtb imx6q-sabresd-hdcp.dtb \ - imx6q-sabresd-enetirq.dtb" + imx6q-sabresd-enetirq.dtb imx6q-sabresd-uart.dtb" UBOOT_CONFIG ??= "sd" UBOOT_CONFIG[sd] = "mx6qsabresd_config,sdcard" -- 2.40.1