aboutsummaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
authorLauren Post <lauren.post@nxp.com>2016-03-31 10:25:24 -0500
committerOtavio Salvador <otavio@ossystems.com.br>2016-04-06 13:08:26 -0300
commitf6ef11ab914a2f665369f875d79f2da0c47027f5 (patch)
tree80995855eb4c3476e0129d49ba0daca110009a40 /conf
parent730984c8d0a6b4e49aed587df7b1c56216b49725 (diff)
downloadmeta-fsl-arm-f6ef11ab914a2f665369f875d79f2da0c47027f5.tar.gz
meta-fsl-arm-f6ef11ab914a2f665369f875d79f2da0c47027f5.tar.bz2
meta-fsl-arm-f6ef11ab914a2f665369f875d79f2da0c47027f5.zip
imx6dlsabreauto and imx6qsabreauto: Add sabreauto-enetirq device tree
ARM: dts: imx6qdl-sabreauto: add enet irq dts files to avoid conflict with MLB ENET gpio irq pin conlict with MLB on i.MX6qdl sabreauto board, since enet gpio irq is extended feature for performance improvement, so let MLB enable in default dts file and newly create sabreauto enet irq dts files. Signed-off-by: Lauren Post <lauren.post@nxp.com> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Diffstat (limited to 'conf')
-rw-r--r--conf/machine/imx6dlsabreauto.conf4
-rw-r--r--conf/machine/imx6qsabreauto.conf4
2 files changed, 4 insertions, 4 deletions
diff --git a/conf/machine/imx6dlsabreauto.conf b/conf/machine/imx6dlsabreauto.conf
index 8c0fe85..a9bdfe5 100644
--- a/conf/machine/imx6dlsabreauto.conf
+++ b/conf/machine/imx6dlsabreauto.conf
@@ -8,8 +8,8 @@ require conf/machine/include/imx6sabreauto-common.inc
SOC_FAMILY = "mx6:mx6dl"
-KERNEL_DEVICETREE = "imx6dl-sabreauto.dtb imx6dl-sabreauto-gpmi-weim.dtb imx6dl-sabreauto-ecspi.dtb "
-KERNEL_DEVICETREE += "imx6dl-sabreauto-flexcan1.dtb "
+KERNEL_DEVICETREE = "imx6dl-sabreauto.dtb imx6dl-sabreauto-gpmi-weim.dtb imx6dl-sabreauto-ecspi.dtb \
+ imx6dl-sabreauto-flexcan1.dtb imx6dl-sabreauto-enetirq.dtb"
UBOOT_CONFIG ??= "sd"
UBOOT_CONFIG[sd] = "mx6dlsabreauto_config,sdcard"
diff --git a/conf/machine/imx6qsabreauto.conf b/conf/machine/imx6qsabreauto.conf
index b8fdce4..3429551 100644
--- a/conf/machine/imx6qsabreauto.conf
+++ b/conf/machine/imx6qsabreauto.conf
@@ -8,8 +8,8 @@ require conf/machine/include/imx6sabreauto-common.inc
SOC_FAMILY = "mx6:mx6q"
-KERNEL_DEVICETREE = "imx6q-sabreauto.dtb imx6q-sabreauto-gpmi-weim.dtb imx6q-sabreauto-ecspi.dtb "
-KERNEL_DEVICETREE += "imx6q-sabreauto-flexcan1.dtb "
+KERNEL_DEVICETREE = "imx6q-sabreauto.dtb imx6q-sabreauto-gpmi-weim.dtb imx6q-sabreauto-ecspi.dtb \
+ imx6q-sabreauto-flexcan1.dtb imx6q-sabreauto-enetirq.dtb"
UBOOT_CONFIG ??= "sd"
UBOOT_CONFIG[sd] = "mx6qsabreauto_config,sdcard"