Update Colibri-VF recpies to use latest meta-toradex (V2.3)

Now uses Linux kernel 3.18
Automaically loads Toradex multi-touch screen driver
Fixes Serial Console and ADB

Cherry-picked from dizzy (d9a08a8a, 85f2d862)

Change-Id: Ie468b441be899b1f07cb998477a36a38cfe5e494
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@theqtcompany.com>

3 files changed, 35 insertions, 4 deletions

diff --git a/conf/distro/include/colibri-vf.conf b/conf/distro/include/colibri-vf.conf
index df85419..483511c 100644
--- a/conf/distro/include/colibri-vf.conf
+++ b/conf/distro/include/colibri-vf.conf
@@ -24,12 +24,11 @@ include conf/distro/include/toradex.inc
 
 BOOTFS_CONTENT = "\
     ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \
+    ${KERNEL_IMAGETYPE}-vf500-colibri-eval-v3.dtb:vf500-colibri-eval-v3.dtb \
+    ${KERNEL_IMAGETYPE}-vf610-colibri-eval-v3.dtb:vf610-colibri-eval-v3.dtb \
     u-boot-${MACHINE}.imx:u-boot.imx \
     "
-BOOTFS_DEPENDS = "u-boot:do_deploy"
-
-SERIAL_CONSOLES = "115200;ttymxc0 \
-                   115200;ttymxc1"
+BOOTFS_DEPENDS = "u-boot:do_deploy virtual/kernel:do_deploy"
 
 MACHINE_EXTRA_INSTALL = "\
         opengldummy \
diff --git a/meta-toradex-extras/recipes/linux/linux-toradex-vf/0001-Enable-Fusion-7-and-10-multi-touch-controller.patch b/meta-toradex-extras/recipes/linux/linux-toradex-vf/0001-Enable-Fusion-7-and-10-multi-touch-controller.patch
new file mode 100644
index 0000000..d92ac62
--- /dev/null
+++ b/meta-toradex-extras/recipes/linux/linux-toradex-vf/0001-Enable-Fusion-7-and-10-multi-touch-controller.patch
@@ -0,0 +1,25 @@
+From d57edef022af184015a8ccd87fa9021024513d55 Mon Sep 17 00:00:00 2001
+From: Andy Nichols <andy.nichols@theqtcompany.com>
+Date: Fri, 6 Mar 2015 10:14:13 +0100
+Subject: [PATCH] Enable Fusion 7 and 10 multi-touch controller
+
+---
+ arch/arm/boot/dts/vf-colibri-eval-v3.dtsi | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/arch/arm/boot/dts/vf-colibri-eval-v3.dtsi b/arch/arm/boot/dts/vf-colibri-eval-v3.dtsi
+index 1f43dbe..9194580 100644
+--- a/arch/arm/boot/dts/vf-colibri-eval-v3.dtsi
++++ b/arch/arm/boot/dts/vf-colibri-eval-v3.dtsi
+@@ -214,7 +214,7 @@
+                gpios = <&gpio0 30 GPIO_ACTIVE_HIGH /* SO-DIMM 28, Pen down interrupt */
+                         &gpio0 23 GPIO_ACTIVE_LOW /* SO-DIMM 30, Reset interrupt */
+                        >;
+-               status = "disabled";
++               status = "okay";
+        };
+ 
+        /* M41T0M6 real time clock on carrier board */
+-- 
+2.3.1
+
diff --git a/meta-toradex-extras/recipes/linux/linux-toradex-vf_3.18.bbappend b/meta-toradex-extras/recipes/linux/linux-toradex-vf_3.18.bbappend
index 4f05386..479be80 100644
--- a/meta-toradex-extras/recipes/linux/linux-toradex-vf_3.18.bbappend
+++ b/meta-toradex-extras/recipes/linux/linux-toradex-vf_3.18.bbappend
@@ -23,4 +23,11 @@
 FILESEXTRAPATHS_append := "${THISDIR}/${PN}:"
 SRC_URI += " \
         file://0001-Allow-builds-with-GCC-4.8.patch \
+        file://0001-Enable-Fusion-7-and-10-multi-touch-controller.patch \
         "
+
+do_configure_prepend () {
+        # FunctionFS for adb
+        echo "CONFIG_USB_FUNCTIONFS=m"  >> ${WORKDIR}/defconfig
+        echo "TOUCHSCREEN_FUSION_F0710A=y" >> ${WORKDIR}/defconfig
+}