From 3c3badde7b9b0f97fe0e4d18ca2770602440c84f Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Thu, 25 Feb 2021 14:46:59 +0200 Subject: toradex: update meta layers MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Use toradex 5.2.0-devel-202102 version from toradex layers. Remove kernel and u-boot patches. Toradex is now using overlay dtbo files to configure displays, the old patches are no longer needed. Change-Id: I5c9c93f0776b2652592c7ec74990dae99b8f601c Reviewed-by: Pasi Petäjäjärvi (cherry picked from commit 63a28bf0fe388d3363f67ccbe908464a0b6cff1b) Reviewed-by: Qt Cherry-pick Bot --- .../conf/distro/include/apalis-imx6.conf | 2 - ...-test-for-Capacitive-Touch-Display-7-Para.patch | 43 --------------- ...-lower-default-resolution-on-HDMI-to-720p.patch | 22 -------- .../u-boot/u-boot-toradex_2020%.bbappend | 34 ------------ ...01-Enable-atmel-mxt-multitouch-controller.patch | 63 ---------------------- .../linux/linux-toradex_5.%.bbappend | 4 -- scripts/manifest.xml | 4 +- 7 files changed, 2 insertions(+), 170 deletions(-) delete mode 100644 meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-bsp/u-boot/u-boot-toradex/0002-apalis-imx6-test-for-Capacitive-Touch-Display-7-Para.patch delete mode 100644 meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-bsp/u-boot/u-boot-toradex/0004-apalis-imx6-lower-default-resolution-on-HDMI-to-720p.patch delete mode 100644 meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-bsp/u-boot/u-boot-toradex_2020%.bbappend delete mode 100644 meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-kernel/linux/linux-toradex/0001-Enable-atmel-mxt-multitouch-controller.patch diff --git a/meta-boot2qt-distro/conf/distro/include/apalis-imx6.conf b/meta-boot2qt-distro/conf/distro/include/apalis-imx6.conf index 9c0c9f3c..19d5adbd 100644 --- a/meta-boot2qt-distro/conf/distro/include/apalis-imx6.conf +++ b/meta-boot2qt-distro/conf/distro/include/apalis-imx6.conf @@ -30,5 +30,3 @@ include conf/distro/include/toradex.inc DEPLOY_CONF_NAME = "Toradex Apalis iMX6" - -KERNEL_MODULE_AUTOLOAD += "atmel_mxt_ts" diff --git a/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-bsp/u-boot/u-boot-toradex/0002-apalis-imx6-test-for-Capacitive-Touch-Display-7-Para.patch b/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-bsp/u-boot/u-boot-toradex/0002-apalis-imx6-test-for-Capacitive-Touch-Display-7-Para.patch deleted file mode 100644 index 83616c85..00000000 --- a/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-bsp/u-boot/u-boot-toradex/0002-apalis-imx6-test-for-Capacitive-Touch-Display-7-Para.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 7b291e88baa5a12a145afec65336c6c164845fb8 Mon Sep 17 00:00:00 2001 -From: Samuli Piippo -Date: Fri, 19 May 2017 12:41:38 +0300 -Subject: [PATCH] apalis-imx6: test for Capacitive Touch Display 7" Parallel - -Test i2c bus if Capacitive Touch Display 7" Parallel display is present -during boot. If found, enable it as the primary display in kernel args. - -Set imx6q-apalis-ixora-v1.1.dtb as the default dtb, as it provides -support for the atmel_mxt_ts touch controller. ---- - include/configs/apalis_imx6.h | 9 +++++++-- - 1 file changed, 7 insertions(+), 2 deletions(-) - -diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h -index c01c2e490c..86539fb026 100644 ---- a/include/configs/apalis_imx6.h -+++ b/include/configs/apalis_imx6.h -@@ -125,7 +125,7 @@ - "scriptaddr=0x17000000\0" - - #ifndef CONFIG_TDX_APALIS_IMX6_V1_0 --#define FDT_FILE "imx6q-apalis-eval.dtb" -+#define FDT_FILE "imx6q-apalis-ixora-v1.1.dtb" - #define FDT_FILE_V1_0 "imx6q-apalis_v1_0-eval.dtb" - #else - #define FDT_FILE "imx6q-apalis_v1_0-eval.dtb" -@@ -153,9 +153,14 @@ - "|| setenv drive 2; mmc rescan; load ${interface} ${drive}:1" \ - " ${loadaddr} flash_blk.img && " \ - "source ${loadaddr}\0" \ -- "setup=setenv setupargs fec_mac=${ethaddr} " \ -+ "setup=run setupvideo; setenv setupargs fec_mac=${ethaddr} " \ - "consoleblank=0 no_console_suspend=1 console=tty1 " \ - "console=${console},${baudrate}n8\0 " \ -+ "setupvideo=i2c dev 0; if i2c probe 4A; " \ -+ "then setenv vidargs mxc_hdmi.only_cea=1 " \ -+ "video=mxcfb0:dev=lcd,FusionF07A,if=RGB24 " \ -+ "video=mxcfb1:off video=mxcfb2:off video=mxcfb3:off " \ -+ "fbmem=32M; fi\0" \ - "setupdate=run setsdupdate || run setusbupdate || run setethupdate\0" \ - "setusbupdate=usb start && setenv interface usb; setenv drive 0; " \ - "load ${interface} ${drive}:1 ${loadaddr} flash_blk.img && " \ diff --git a/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-bsp/u-boot/u-boot-toradex/0004-apalis-imx6-lower-default-resolution-on-HDMI-to-720p.patch b/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-bsp/u-boot/u-boot-toradex/0004-apalis-imx6-lower-default-resolution-on-HDMI-to-720p.patch deleted file mode 100644 index 4ef42e70..00000000 --- a/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-bsp/u-boot/u-boot-toradex/0004-apalis-imx6-lower-default-resolution-on-HDMI-to-720p.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 5b5a26f3222d84687b026683fd221b115537dbf2 Mon Sep 17 00:00:00 2001 -From: Samuli Piippo -Date: Wed, 18 Oct 2017 13:20:25 +0300 -Subject: [PATCH] apalis-imx6: lower default resolution on HDMI to 720p - ---- - include/configs/apalis_imx6.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h -index c01c2e490c..79bae9c2b2 100644 ---- a/include/configs/apalis_imx6.h -+++ b/include/configs/apalis_imx6.h -@@ -163,7 +163,7 @@ - "splashpos=m,m\0" \ - "splashimage=" __stringify(CONFIG_LOADADDR) "\0" \ - "vidargs=mxc_hdmi.only_cea=1 " \ -- "video=mxcfb1:dev=hdmi,1920x1080M@60,if=RGB24 " \ -+ "video=mxcfb1:dev=hdmi,1280x720M@60,if=RGB24 " \ - "video=mxcfb0:off video=mxcfb2:off video=mxcfb3:off " \ - "fbmem=32M\0 " - diff --git a/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-bsp/u-boot/u-boot-toradex_2020%.bbappend b/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-bsp/u-boot/u-boot-toradex_2020%.bbappend deleted file mode 100644 index d1348801..00000000 --- a/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-bsp/u-boot/u-boot-toradex_2020%.bbappend +++ /dev/null @@ -1,34 +0,0 @@ -############################################################################ -## -## Copyright (C) 2020 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_prepend := "${THISDIR}/${PN}:" -SRC_URI_append_apalis-imx6 = " \ - file://0002-apalis-imx6-test-for-Capacitive-Touch-Display-7-Para.patch \ - file://0004-apalis-imx6-lower-default-resolution-on-HDMI-to-720p.patch \ - " diff --git a/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-kernel/linux/linux-toradex/0001-Enable-atmel-mxt-multitouch-controller.patch b/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-kernel/linux/linux-toradex/0001-Enable-atmel-mxt-multitouch-controller.patch deleted file mode 100644 index 603a0cb6..00000000 --- a/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-kernel/linux/linux-toradex/0001-Enable-atmel-mxt-multitouch-controller.patch +++ /dev/null @@ -1,63 +0,0 @@ -From b13c1bb76bc78333a04c29d88ce33b45e7a9fe9f 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 - -Need to disable fusion touch to get the new atmel mxt multitouch -controller to work. ---- - arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts | 1 + - arch/arm/boot/dts/imx6q-apalis-ixora-v1.2.dts | 1 + - arch/arm/boot/dts/imx6q-apalis-ixora.dts | 1 + - arch/arm/boot/dts/imx6qdl-apalis.dtsi | 2 +- - 4 files changed, 4 insertions(+), 1 deletion(-) - -diff --git a/arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts b/arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts -index af14f9b13d8d..24f43f10c9a2 100644 ---- a/arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts -+++ b/arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts -@@ -141,6 +141,7 @@ - gpios = <&gpio6 10 GPIO_ACTIVE_HIGH /* MXM3 11, Pen down interrupt */ - &gpio6 9 GPIO_ACTIVE_HIGH /* MXM3 13, Reset */ - >; -+ status = "disabled"; - }; - - /* M41T0M6 real time clock on carrier board */ -diff --git a/arch/arm/boot/dts/imx6q-apalis-ixora-v1.2.dts b/arch/arm/boot/dts/imx6q-apalis-ixora-v1.2.dts -index 80cc07ed429f..77cdbfff517a 100644 ---- a/arch/arm/boot/dts/imx6q-apalis-ixora-v1.2.dts -+++ b/arch/arm/boot/dts/imx6q-apalis-ixora-v1.2.dts -@@ -159,6 +159,7 @@ - gpios = <&gpio6 10 GPIO_ACTIVE_HIGH /* MXM3 11, Pen down interrupt */ - &gpio6 9 GPIO_ACTIVE_HIGH /* MXM3 13, Reset */ - >; -+ status = "disabled"; - }; - - /* M41T0M6 real time clock on carrier board */ -diff --git a/arch/arm/boot/dts/imx6q-apalis-ixora.dts b/arch/arm/boot/dts/imx6q-apalis-ixora.dts -index 1a0bade9a43d..fa30382063c5 100644 ---- a/arch/arm/boot/dts/imx6q-apalis-ixora.dts -+++ b/arch/arm/boot/dts/imx6q-apalis-ixora.dts -@@ -132,6 +132,7 @@ - gpios = <&gpio6 10 GPIO_ACTIVE_HIGH /* MXM3 11, Pen down interrupt */ - &gpio6 9 GPIO_ACTIVE_HIGH /* MXM3 13, Reset */ - >; -+ status = "disabled"; - }; - - eeprom@50 { -diff --git a/arch/arm/boot/dts/imx6qdl-apalis.dtsi b/arch/arm/boot/dts/imx6qdl-apalis.dtsi -index 84d08f01ab44..e2da50327d2d 100644 ---- a/arch/arm/boot/dts/imx6qdl-apalis.dtsi -+++ b/arch/arm/boot/dts/imx6qdl-apalis.dtsi -@@ -559,7 +559,7 @@ - interrupt-parent = <&gpio6>; - interrupts = <10 IRQ_TYPE_EDGE_FALLING>; - reset-gpios = <&gpio6 9 GPIO_ACTIVE_HIGH>; -- status = "disabled"; -+ status = "okay"; - }; - }; - diff --git a/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-kernel/linux/linux-toradex_5.%.bbappend b/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-kernel/linux/linux-toradex_5.%.bbappend index b5fe5d52..3361bdb5 100644 --- a/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-kernel/linux/linux-toradex_5.%.bbappend +++ b/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-kernel/linux/linux-toradex_5.%.bbappend @@ -29,10 +29,6 @@ FILESEXTRAPATHS_append := "${THISDIR}/${PN}:" -SRC_URI += "\ - file://0001-Enable-atmel-mxt-multitouch-controller.patch \ -" - RDEPENDS_${KERNEL_PACKAGE_NAME}-base = "${KERNEL_PACKAGE_NAME}-image ${KERNEL_PACKAGE_NAME}-devicetree" do_preconfigure_prepend () { diff --git a/scripts/manifest.xml b/scripts/manifest.xml index 3aae1462..33fb5527 100644 --- a/scripts/manifest.xml +++ b/scripts/manifest.xml @@ -89,12 +89,12 @@ fetch="git://git.toradex.com"/> -- cgit v1.2.3