[meta-freescale] [meta-fsl-arm-extra][PATCH 3/4] cm-fx6: update the cm-fx6 machine configuration

[Valentin Raevsky]

Update the cm-fx6 machine configuration:

1) Fix the device tree blob list.
2) Fix u_boot and kernel virtual providers' names with
respect to the SoC family. This change solves a multiple
provider issue that the image build procedure runs into.
3) Add the firmware-compulab to the buid.

Signed-off-by: Valentin Raevsky <valentin at compulab.co.il>
---
 conf/machine/cm-fx6.conf | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/conf/machine/cm-fx6.conf b/conf/machine/cm-fx6.conf
index 8166b5a..5d8f3dc 100644
--- a/conf/machine/cm-fx6.conf
+++ b/conf/machine/cm-fx6.conf
@@ -9,13 +9,15 @@ require conf/machine/include/tune-cortexa9.inc
 
 SOC_FAMILY = "mx6:mx6dl:mx6q"
 
-PREFERRED_PROVIDER_u-boot = "u-boot-compulab"
-PREFERRED_PROVIDER_virtual/kernel = "linux-compulab"
+PREFERRED_PROVIDER_u-boot_mx6 = "u-boot-compulab"
+PREFERRED_PROVIDER_virtual/kernel_mx6 = "linux-compulab"
 
 UBOOT_MACHINE ?= "cm_fx6_defconfig"
 
-KERNEL_DEVICETREE = "imx6dl-cm-fx6.dtb  imx6dl-sbc-fx6.dtb  imx6dl-sbc-fx6m.dtb  imx6q-cm-fx6.dtb  imx6q-sbc-fx6.dtb  imx6q-sbc-fx6m.dtb"
+KERNEL_DEVICETREE = "imx6dl-sbc-fx6.dtb  imx6dl-sbc-fx6m.dtb  imx6q-sbc-fx6.dtb  imx6q-sbc-fx6m.dtb"
 
 MACHINE_FEATURES += "pci wifi bluetooth alsa bluetooth serial usbhost wifi"
 
+MACHINE_FIRMWARE_append_mx6 += "firmware-compulab"
+
 SERIAL_CONSOLE = "115200 ttymxc3"
-- 
1.9.1