imx7s-warp: bring back kernel with display supportv5.12.0-beta3

Add old kernel recipe from meta-freescale-3rdparty layer that was
removed in sumo branch. It provides support for the display and the
touchscreen. Fix perf build with old kernel sources and use correct
appcontroller.conf after MACHINEOVERRIDES was changed in the machine
config.

Task-number: QTBUG-68899
Change-Id: I6d2cd70951f86a99a8878915ce1bfc598dc95ee0
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>

2 files changed, 23 insertions, 0 deletions

diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-fslc/0001-use-imx7d-warp.dtb.patch b/meta-fsl-extras/recipes/u-boot/u-boot-fslc/0001-use-imx7d-warp.dtb.patch
new file mode 100644
index 0000000..2c1c70d
--- /dev/null
+++ b/meta-fsl-extras/recipes/u-boot/u-boot-fslc/0001-use-imx7d-warp.dtb.patch
@@ -0,0 +1,22 @@
+From d9489c704107e85a0c3ba68211adbca695c88644 Mon Sep 17 00:00:00 2001
+From: Samuli Piippo <samuli.piippo@qt.io>
+Date: Wed, 13 Sep 2017 09:40:44 +0300
+Subject: [PATCH] use imx7d-warp.dtb
+
+---
+ include/configs/warp7.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/include/configs/warp7.h b/include/configs/warp7.h
+index 2a7789baa2..7b44f85a87 100644
+--- a/include/configs/warp7.h
++++ b/include/configs/warp7.h
+@@ -39,7 +39,7 @@
+        "ethact=usb_ether\0" \
+        "fdt_high=0xffffffff\0" \
+        "initrd_high=0xffffffff\0" \
+-       "fdt_file=imx7s-warp.dtb\0" \
++       "fdt_file=imx7d-warp.dtb\0" \
+        "fdt_addr=" __stringify(CONFIG_SYS_FDT_ADDR)"\0" \
+        "optee_addr=" __stringify(CONFIG_OPTEE_LOAD_ADDR)"\0" \
+        "boot_fdt=try\0" \
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-fslc_%.bbappend b/meta-fsl-extras/recipes/u-boot/u-boot-fslc_%.bbappend
index f17045d..815244f 100644
--- a/meta-fsl-extras/recipes/u-boot/u-boot-fslc_%.bbappend
+++ b/meta-fsl-extras/recipes/u-boot/u-boot-fslc_%.bbappend
@@ -30,4 +30,5 @@
 FILESEXTRAPATHS_append := "${THISDIR}/${PN}:"
 SRC_URI += " \
         file://0001-Updated-kernel-arguments-for-sabre-sd.patch \
+        file://0001-use-imx7d-warp.dtb.patch \
         "