diff options
author | Andy Nichols <andy.nichols@theqtcompany.com> | 2015-02-19 11:33:54 +0100 |
---|---|---|
committer | Andy Nichols <andy.nichols@theqtcompany.com> | 2015-03-31 16:07:54 +0300 |
commit | d9a08a8a9419a1635d4985e75c43263aaab9577d (patch) | |
tree | 4072583ca3ea97f6c6e66e32812daf77a50b1393 | |
parent | d799779d19aa8b21e6d8cb6ef0f12a2e34d35794 (diff) |
Update Colibri-VF recpies to use dizzy
Now uses Linux kernel 3.18
Automaically loads Toradex multi-touch screen driver
Fixes Serial Console and ADB
Change-Id: Idbccb170ddd78992f5b340a96fe5aae5628c6c82
Reviewed-by: Samuli Piippo <samuli.piippo@theqtcompany.com>
3 files changed, 60 insertions, 3 deletions
diff --git a/conf/distro/include/colibri-vf.conf b/conf/distro/include/colibri-vf.conf index b4b53580..483511c8 100644 --- a/conf/distro/include/colibri-vf.conf +++ b/conf/distro/include/colibri-vf.conf @@ -24,13 +24,12 @@ 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 virtual/kernel:do_deploy" -SERIAL_CONSOLES = "115200;ttymxc0 \ - 115200;ttymxc1" - 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 00000000..d92ac620 --- /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 new file mode 100644 index 00000000..a723ab8a --- /dev/null +++ b/meta-toradex-extras/recipes/linux/linux-toradex-vf_3.18.bbappend @@ -0,0 +1,33 @@ +############################################################################# +## +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://www.qt.io/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + +FILESEXTRAPATHS_append := "${THISDIR}/${PN}:" + +SRC_URI += " \ + file://0001-Enable-Fusion-7-and-10-multi-touch-controller.patch \ + " + +config_script () { + # FunctionFS for adb + echo "CONFIG_USB_FUNCTIONFS=m" >> ${S}/.config + echo "TOUCHSCREEN_FUSION_F0710A=y" >> ${S}/.config +} |