diff options
author | Lauren Post <lauren.post@freescale.com> | 2013-12-16 10:53:33 -0600 |
---|---|---|
committer | Otavio Salvador <otavio@ossystems.com.br> | 2014-03-03 15:01:53 -0300 |
commit | 4930e0f7bdaae946eab3744e3e695de922a7bd8c (patch) | |
tree | 2481f48d9203adc0efb1c31c09bf3dc750349490 /conf | |
parent | 9586541c8719d5e4ba7481632c90a851c383e495 (diff) | |
download | meta-fsl-arm-4930e0f7bdaae946eab3744e3e695de922a7bd8c.tar.gz |
imx6qsabreauto.conf: Add ecspi and flexcan1 device tree support
The flexcan1 device tree supports flexcan1 enabled with fec disabled
because of a pin conflict between flexcan1 and fec.
The ecspi device tree supports ecspi by fixing the pin conflict with i2c3.
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/imx6qsabreauto.conf | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/conf/machine/imx6qsabreauto.conf b/conf/machine/imx6qsabreauto.conf index 93f8851..6d52f60 100644 --- a/conf/machine/imx6qsabreauto.conf +++ b/conf/machine/imx6qsabreauto.conf | |||
@@ -8,7 +8,8 @@ require conf/machine/include/imx6sabreauto-common.inc | |||
8 | 8 | ||
9 | SOC_FAMILY = "mx6:mx6q" | 9 | SOC_FAMILY = "mx6:mx6q" |
10 | 10 | ||
11 | KERNEL_DEVICETREE = "imx6q-sabreauto.dtb imx6q-sabreauto-gpmi-weim.dtb" | 11 | KERNEL_DEVICETREE = "imx6q-sabreauto.dtb imx6q-sabreauto-gpmi-weim.dtb imx6q-sabreauto-ecspi.dtb " |
12 | KERNEL_DEVICETREE += "imx6q-sabreauto-flexcan1.dtb " | ||
12 | 13 | ||
13 | UBOOT_CONFIG ??= "sd" | 14 | UBOOT_CONFIG ??= "sd" |
14 | UBOOT_CONFIG[sd] = "mx6qsabreauto_config,sdcard" | 15 | UBOOT_CONFIG[sd] = "mx6qsabreauto_config,sdcard" |