[meta-freescale] [3rdparty][PATCH v3 06/15] apalis-imx6.conf: add device trees for ixora and use-mainline-bsp

[Max Krummenacher]

Add a device tree for the Ixora carrier board.

Add the device tree available in mainline for use with the
use-mainline-bsp override.

While at it unify the @SOC description variable with other boards.

Signed-off-by: Max Krummenacher <max.krummenacher at toradex.com>
---
 conf/machine/apalis-imx6.conf | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/conf/machine/apalis-imx6.conf b/conf/machine/apalis-imx6.conf
index 3e960d9..97d0b49 100644
--- a/conf/machine/apalis-imx6.conf
+++ b/conf/machine/apalis-imx6.conf
@@ -1,6 +1,6 @@
 #@TYPE: Machine
 #@NAME: Toradex Apalis iMX6Q/D
-#@SOC: i.MX6
+#@SOC: i.MX6Q
 #@DESCRIPTION: Machine configuration for Toradex Apalis iMX6 SOM
 #@MAINTAINER: Max Krummenacher <max.krummenacher at toradex.com>
 
@@ -9,9 +9,12 @@ MACHINEOVERRIDES =. "mx6:mx6q:"
 include conf/machine/include/imx-base.inc
 include conf/machine/include/tune-cortexa9.inc
 
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-toradex"
+PREFERRED_PROVIDER_virtual/kernel ??= "linux-toradex"
+PREFERRED_PROVIDER_virtual/kernel_use-mainline-bsp ??= "linux-fslc"
 KERNEL_DEVICETREE += "imx6q-apalis-eval.dtb imx6q-apalis_v1_0-eval.dtb \
-                     imx6q-apalis-ixora.dtb imx6q-apalis_v1_0-ixora.dtb"
+                      imx6q-apalis-ixora.dtb imx6q-apalis_v1_0-ixora.dtb \
+                      imx6q-apalis-ixora-v1.1.dtb"
+KERNEL_DEVICETREE_use-mainline-bsp += "imx6q-apalis-ixora.dtb"
 KERNEL_IMAGETYPE = "uImage"
 # The kernel lives in a seperate FAT partition, don't deploy it in /boot/
 RDEPENDS_kernel-base = ""
-- 
2.9.4