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 | 26c3541685780b1bf32bec4a4d73d46057225ab7 (patch) | |
| tree | 45c5012be18a73e56ceff853efef90e2bc74cb59 | |
| parent | 3ce45bfafcb6f367905c1dcc3fc07d33d31b9d0d (diff) | |
| download | meta-freescale-26c3541685780b1bf32bec4a4d73d46057225ab7.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>
| -rw-r--r-- | meta-fsl-arm/conf/machine/imx6qsabreauto.conf | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/meta-fsl-arm/conf/machine/imx6qsabreauto.conf b/meta-fsl-arm/conf/machine/imx6qsabreauto.conf index 93f8851f7..6d52f60fd 100644 --- a/meta-fsl-arm/conf/machine/imx6qsabreauto.conf +++ b/meta-fsl-arm/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" |
