toradex: update meta layers

Update meta-toradex-nxp & meta-toradex-bsp-common layers to more
recent revisions in their corresponding zeus branches

Notes:
* Removed default tune fix for colibri-imx8x as updated
  meta-toradex-nxp layer handles that in commit
  "e661d267557715b60ea854008f41ad75016cfeed mx8qxp: require
  tune-cortexa35.inc instead of arch-arm64.inc".
* Added placeholder definition for TEZI_DATE introduced in
  updated meta-toradex-bsp-common layer by commit
  "df77984fca2b4f0536df48b966f1043ffe7425fb image_type_tezi.bbclass:
  introduce TEZI_DATE". The variable is not used in meta-boot2qt
  but the "dummy" definition is needed to prevent build break.

Task-number: QTBUG-84149
Change-Id: I5342fa37534eb2c7d0d7c055850610d7ed656c07
Reviewed-by: Rami Potinkara <rami.potinkara@qt.io>

4 files changed, 14 insertions, 12 deletions

diff --git a/meta-boot2qt-distro/conf/distro/include/fsl.inc b/meta-boot2qt-distro/conf/distro/include/fsl.inc
index ecc3a9a0..b9fedad9 100644
--- a/meta-boot2qt-distro/conf/distro/include/fsl.inc
+++ b/meta-boot2qt-distro/conf/distro/include/fsl.inc
@@ -38,9 +38,6 @@ QBSP_IMAGE_CONTENT ?= "\
     ${IMAGE_LINK_NAME}.conf \
     "
 
-# meta-freescale sets mx8qxp to cortexa35-crypto unavailable in zeus
-DEFAULTTUNE_mx8qxp = "aarch64"
-
 # Use gstreamer 1.14 from meta-freescale
 PREFERRED_VERSION_gstreamer1.0 ?= "1.14.imx"
 PREFERRED_VERSION_gstreamer1.0-plugins-base ?= "1.14.imx"
diff --git a/meta-boot2qt-distro/conf/distro/include/toradex.inc b/meta-boot2qt-distro/conf/distro/include/toradex.inc
index 9b3dd292..2ff8064b 100644
--- a/meta-boot2qt-distro/conf/distro/include/toradex.inc
+++ b/meta-boot2qt-distro/conf/distro/include/toradex.inc
@@ -54,6 +54,11 @@ IMAGE_BOOT_FILES_append_mx7 += "${SCRIPTS}"
 
 IMAGE_FSTYPES += "teziimg"
 
+# Placeholder for TEZI_DATE introduced in meta-toradex-bsp-common layer.
+# We don't use it as we override the tezi rootfs creation with our own version
+# but it causes a build failure if not defined
+TEZI_DATE = "20200101090000"
+
 QBSP_IMAGE_CONTENT += "\
     ${IMAGE_LINK_NAME}.tezi.tar \
 "
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
index 6e6256e9..156de1f8 100644
--- 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
@@ -1,4 +1,4 @@
-From f976eba0ddc8bc97ab3049a6a2e4f87110ada029 Mon Sep 17 00:00:00 2001
+From 406117d80603f8364a50e948e5afbe197d2c6082 Mon Sep 17 00:00:00 2001
 From: Samuli Piippo <samuli.piippo@qt.io>
 Date: Fri, 6 Oct 2017 15:54:35 +0300
 Subject: [PATCH] Enable atmel mxt multitouch controller for ixora v1.1 dtb
@@ -12,13 +12,13 @@ controller to work.
  3 files changed, 6 insertions(+), 3 deletions(-)
 
 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 6c4aa68999a9..6ce362066c3b 100644
+index 92bdfe2528b5..2f1ae8e2fb21 100644
 --- a/arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts
 +++ b/arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts
 @@ -243,7 +243,7 @@
  		interrupt-parent = <&gpio6>;
  		interrupts = <10 IRQ_TYPE_EDGE_FALLING>;
- 		reset-gpios = <&gpio6 9 GPIO_ACTIVE_HIGH>; /* SODIMM 13 */
+ 		reset-gpios = <&gpio6 9 GPIO_ACTIVE_HIGH>; /* MXM3 13 */
 -		status = "disabled";
 +		status = "okay";
  	};
@@ -33,13 +33,13 @@ index 6c4aa68999a9..6ce362066c3b 100644
  
  	/* 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 c6ffe7477650..cfb6011d7b5c 100644
+index aec021fc1213..8a7c14fbd911 100644
 --- a/arch/arm/boot/dts/imx6q-apalis-ixora-v1.2.dts
 +++ b/arch/arm/boot/dts/imx6q-apalis-ixora-v1.2.dts
 @@ -259,7 +259,7 @@
  		interrupt-parent = <&gpio6>;
  		interrupts = <10 IRQ_TYPE_EDGE_FALLING>;
- 		reset-gpios = <&gpio6 9 GPIO_ACTIVE_HIGH>; /* SODIMM 13 */
+ 		reset-gpios = <&gpio6 9 GPIO_ACTIVE_HIGH>; /* MXM3 13 */
 -		status = "disabled";
 +		status = "okay";
  	};
@@ -54,13 +54,13 @@ index c6ffe7477650..cfb6011d7b5c 100644
  
  	/* 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 755ea18dcc14..d9947bff9bbe 100644
+index cf396b1a4235..be1b978393fa 100644
 --- a/arch/arm/boot/dts/imx6q-apalis-ixora.dts
 +++ b/arch/arm/boot/dts/imx6q-apalis-ixora.dts
 @@ -234,7 +234,7 @@
  		interrupt-parent = <&gpio6>;
  		interrupts = <10 IRQ_TYPE_EDGE_FALLING>;
- 		reset-gpios = <&gpio6 9 GPIO_ACTIVE_HIGH>; /* SODIMM 13 */
+ 		reset-gpios = <&gpio6 9 GPIO_ACTIVE_HIGH>; /* MXM3 13 */
 -		status = "disabled";
 +		status = "okay";
  	};
diff --git a/scripts/manifest.xml b/scripts/manifest.xml
index f73ae7d0..95098b64 100644
--- a/scripts/manifest.xml
+++ b/scripts/manifest.xml
@@ -84,11 +84,11 @@
           fetch="git://git.toradex.com"/>
   <project name="meta-toradex-bsp-common"
            remote="toradex"
-           revision="fbd77af45f32e88e96d0efe0317d346a55e5580a"
+           revision="7ed9958daea91fa3116132b5788495caa18db51d"
            path="sources/meta-toradex-bsp-common"/>
   <project name="meta-toradex-nxp"
            remote="toradex"
-           revision="e5049a9c1bf8575beec0d7aab06f5d9cc7093283"
+           revision="ac5028651745ea2b541dbc0a847ffd737fc5ef76"
            path="sources/meta-toradex-nxp"/>
 
   <!-- BoundaryDevices -->