From 08713303e05da028ec4001710331fdc5edf00439 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Wed, 26 Sep 2018 11:24:06 +0300 Subject: toradex: update to latest release Update toradex layers to 2.8b3 (rocko) and make the necessary adaptations. Use WIC for image creation. Change-Id: I7f7cc76e6c215c9edba1bcbede796b78f08b258c Reviewed-by: Mikko Gronoff --- meta-toradex-extras/conf/layer.conf | 4 +++ ...01-Enable-atmel-mxt-multitouch-controller.patch | 19 +++++++------ .../recipes/linux/linux-toradex_4.1-2.0.x.bbappend | 32 ---------------------- .../recipes/linux/linux-toradex_4.9-1.0.x.bbappend | 32 ++++++++++++++++++++++ 4 files changed, 46 insertions(+), 41 deletions(-) delete mode 100644 meta-toradex-extras/recipes/linux/linux-toradex_4.1-2.0.x.bbappend create mode 100644 meta-toradex-extras/recipes/linux/linux-toradex_4.9-1.0.x.bbappend (limited to 'meta-toradex-extras') diff --git a/meta-toradex-extras/conf/layer.conf b/meta-toradex-extras/conf/layer.conf index 213a535b..3a43fd7e 100644 --- a/meta-toradex-extras/conf/layer.conf +++ b/meta-toradex-extras/conf/layer.conf @@ -40,3 +40,7 @@ BBFILE_PATTERN_b2qt_toradex := "^${LAYERDIR}/" BBFILE_PRIORITY_b2qt_toradex = "20" LAYERSERIES_COMPAT_b2qt_toradex = "sumo" + +# override toradex layer COMPATs +LAYERSERIES_COMPAT_toradex-bsp-common-layer = "sumo" +LAYERSERIES_COMPAT_toradex-nxp-layer = "sumo" diff --git a/meta-toradex-extras/recipes/linux/linux-toradex/0001-Enable-atmel-mxt-multitouch-controller.patch b/meta-toradex-extras/recipes/linux/linux-toradex/0001-Enable-atmel-mxt-multitouch-controller.patch index 1535234f..1f63fee0 100644 --- a/meta-toradex-extras/recipes/linux/linux-toradex/0001-Enable-atmel-mxt-multitouch-controller.patch +++ b/meta-toradex-extras/recipes/linux/linux-toradex/0001-Enable-atmel-mxt-multitouch-controller.patch @@ -1,4 +1,4 @@ -From 37a2e407172b37a880d04c5a7721aeff498854ad Mon Sep 17 00:00:00 2001 +From 823475bf681e1dbb4ad8e43935232ae39b918d9c Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Fri, 6 Oct 2017 15:54:35 +0300 Subject: [PATCH] Enable atmel mxt multitouch controller for ixora v1.1 dtb @@ -6,24 +6,25 @@ Subject: [PATCH] Enable atmel mxt multitouch controller for ixora v1.1 dtb Need to disable fusion touch to get the new atmel mxt multitouch controller to work. --- - arch/arm/boot/dts/imx6qdl-apalis-ixora-v1.1.dtsi | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + arch/arm/boot/dts/imx6qdl-apalis-ixora-v1.1.dtsi | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/imx6qdl-apalis-ixora-v1.1.dtsi b/arch/arm/boot/dts/imx6qdl-apalis-ixora-v1.1.dtsi -index 354bf80d..1181502 100644 +index 26525e24a6c7..78a1011c1ea2 100644 --- a/arch/arm/boot/dts/imx6qdl-apalis-ixora-v1.1.dtsi +++ b/arch/arm/boot/dts/imx6qdl-apalis-ixora-v1.1.dtsi -@@ -166,7 +166,6 @@ - reg = <0x4a>; +@@ -160,7 +160,7 @@ interrupt-parent = <&gpio6>; interrupts = <10 IRQ_TYPE_EDGE_FALLING>; + reset-gpios = <&gpio6 9 GPIO_ACTIVE_HIGH>; /* SODIMM 13 */ - status = "disabled"; ++ status = "okay"; }; pcap@10 { -@@ -176,6 +175,7 @@ - gpios = <&gpio6 10 0 /* MXM3 11, Pen down interrupt */ - &gpio6 9 0 /* MXM3 13, Reset */ +@@ -170,6 +170,7 @@ + gpios = <&gpio6 10 GPIO_ACTIVE_HIGH /* MXM3 11, Pen down interrupt */ + &gpio6 9 GPIO_ACTIVE_HIGH /* MXM3 13, Reset */ >; + status = "disabled"; }; diff --git a/meta-toradex-extras/recipes/linux/linux-toradex_4.1-2.0.x.bbappend b/meta-toradex-extras/recipes/linux/linux-toradex_4.1-2.0.x.bbappend deleted file mode 100644 index eadfa154..00000000 --- a/meta-toradex-extras/recipes/linux/linux-toradex_4.1-2.0.x.bbappend +++ /dev/null @@ -1,32 +0,0 @@ -############################################################################ -## -## Copyright (C) 2017 The Qt Company Ltd. -## Contact: https://www.qt.io/licensing/ -## -## This file is part of the Boot to Qt meta layer. -## -## $QT_BEGIN_LICENSE:GPL$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see https://www.qt.io/terms-conditions. For further -## information use the contact form at https://www.qt.io/contact-us. -## -## GNU General Public License Usage -## Alternatively, this file may be used under the terms of the GNU -## General Public License version 3 or (at your option) any later version -## approved by the KDE Free Qt Foundation. The licenses are as published by -## the Free Software Foundation and appearing in the file LICENSE.GPL3 -## included in the packaging of this file. Please review the following -## information to ensure the GNU General Public License requirements will -## be met: https://www.gnu.org/licenses/gpl-3.0.html. -## -## $QT_END_LICENSE$ -## -############################################################################ - -FILESEXTRAPATHS_append := "${THISDIR}/${PN}:" - -SRC_URI += "file://0001-Enable-atmel-mxt-multitouch-controller.patch" diff --git a/meta-toradex-extras/recipes/linux/linux-toradex_4.9-1.0.x.bbappend b/meta-toradex-extras/recipes/linux/linux-toradex_4.9-1.0.x.bbappend new file mode 100644 index 00000000..eadfa154 --- /dev/null +++ b/meta-toradex-extras/recipes/linux/linux-toradex_4.9-1.0.x.bbappend @@ -0,0 +1,32 @@ +############################################################################ +## +## Copyright (C) 2017 The Qt Company Ltd. +## Contact: https://www.qt.io/licensing/ +## +## This file is part of the Boot to Qt meta layer. +## +## $QT_BEGIN_LICENSE:GPL$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see https://www.qt.io/terms-conditions. For further +## information use the contact form at https://www.qt.io/contact-us. +## +## GNU General Public License Usage +## Alternatively, this file may be used under the terms of the GNU +## General Public License version 3 or (at your option) any later version +## approved by the KDE Free Qt Foundation. The licenses are as published by +## the Free Software Foundation and appearing in the file LICENSE.GPL3 +## included in the packaging of this file. Please review the following +## information to ensure the GNU General Public License requirements will +## be met: https://www.gnu.org/licenses/gpl-3.0.html. +## +## $QT_END_LICENSE$ +## +############################################################################ + +FILESEXTRAPATHS_append := "${THISDIR}/${PN}:" + +SRC_URI += "file://0001-Enable-atmel-mxt-multitouch-controller.patch" -- cgit v1.2.3