7 files changed, 5 insertions, 148 deletions

diff --git a/meta-boot2qt-distro/conf/distro/include/imx7s-warp.conf b/meta-boot2qt-distro/conf/distro/include/imx7s-warp.conf
index eb40035..906b4fe 100644
--- a/meta-boot2qt-distro/conf/distro/include/imx7s-warp.conf
+++ b/meta-boot2qt-distro/conf/distro/include/imx7s-warp.conf
@@ -35,5 +35,3 @@ PREFERRED_PROVIDER_virtual/egl = "opengldummy"
 PREFERRED_PROVIDER_virtual/libgles2 = "opengldummy"
 
 DISTRO_FEATURES_remove = "webengine wayland vulkan"
-
-KERNEL_DEVICETREE = "imx7d-warp.dtb"
diff --git a/meta-fsl-extras/recipes/linux/linux-warp7/0001-Fix-dev-hwrng-by-enabling-warp7-crypto-device.patch b/meta-fsl-extras/recipes/linux/linux-warp7/0001-Fix-dev-hwrng-by-enabling-warp7-crypto-device.patch
deleted file mode 100644
index dbb7995..0000000
--- a/meta-fsl-extras/recipes/linux/linux-warp7/0001-Fix-dev-hwrng-by-enabling-warp7-crypto-device.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 9ffa222dbaa3b11c3b1399192e0abd478fc3b564 Mon Sep 17 00:00:00 2001
-From: Sami Nurmenniemi <sami.nurmenniemi@qt.io>
-Date: Mon, 18 Sep 2017 12:45:54 +0300
-Subject: [PATCH 1/1] Fix /dev/hwrng by enabling warp7 crypto-device
-
----
- arch/arm/boot/dts/imx7d-warp.dts | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/arch/arm/boot/dts/imx7d-warp.dts b/arch/arm/boot/dts/imx7d-warp.dts
-index ee72690..19aee0e 100755
---- a/arch/arm/boot/dts/imx7d-warp.dts
-+++ b/arch/arm/boot/dts/imx7d-warp.dts
-@@ -181,7 +181,7 @@
- };
- 
- &crypto {
--       status = "disabled";
-+       status = "okay";
- };
- 
- &clks {
--- 
-2.7.4
-
diff --git a/meta-fsl-extras/recipes/linux/linux-warp7_4.1.bbappend b/meta-fsl-extras/recipes/linux/linux-warp7_4.1.bbappend
deleted file mode 100644
index 3b9fc50..0000000
--- a/meta-fsl-extras/recipes/linux/linux-warp7_4.1.bbappend
+++ /dev/null
@@ -1,52 +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$
-##
-############################################################################
-
-SRCBRANCH = "linux_4.1.29"
-SRCREV = "881845d84e3c2e58a00b9c36616203d748b7df0e"
-LOCALVERSION = "-warp7"
-
-FILESEXTRAPATHS_append := "${THISDIR}/${PN}:"
-SRC_URI += " \
-        file://0001-Fix-dev-hwrng-by-enabling-warp7-crypto-device.patch \
-        "
-
-do_configure_prepend() {
-    echo "CONFIG_NAMESPACES=y"      >> ${B}/.config
-    echo "CONFIG_FHANDLE=y"         >> ${B}/.config
-    echo "CONFIG_USB_FUNCTIONFS=m"  >> ${B}/.config
-
-    echo "CONFIG_MXC_CAMERA_OV2680_MIPI=m"              >> ${B}/.config
-    echo "CONFIG_FB_MXC_TRULY_PANEL_TDO_ST7796H=y"      >> ${B}/.config
-    echo "CONFIG_TOUCHSCREEN_SYNAPTICS_DSX_CORE=y"      >> ${B}/.config
-    echo "CONFIG_TOUCHSCREEN_SYNAPTICS_DSX_RMI_DEV=y    >> ${B}/.config
-    echo "CONFIG_TOUCHSCREEN_SYNAPTICS_DSX_FW_UPDATE=y  >> ${B}/.config
-
-    echo "CONFIG_FTRACE=y"                              >> ${B}/.config
-    echo "CONFIG_UPROBE_EVENT=y"                        >> ${B}/.config
-}
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-fslc/0001-Updated-kernel-arguments-for-sabre-sd.patch b/meta-fsl-extras/recipes/u-boot/u-boot-fslc/0001-Updated-kernel-arguments-for-sabre-sd.patch
index 928fb8c..fbf83da 100644
--- a/meta-fsl-extras/recipes/u-boot/u-boot-fslc/0001-Updated-kernel-arguments-for-sabre-sd.patch
+++ b/meta-fsl-extras/recipes/u-boot/u-boot-fslc/0001-Updated-kernel-arguments-for-sabre-sd.patch
@@ -1,4 +1,4 @@
-From 15ba0d8f9e2ad8f3024734810088e4caddaaec5a Mon Sep 17 00:00:00 2001
+From 2d762386376baadfe6a6447c2c19fa2d6329b985 Mon Sep 17 00:00:00 2001
 From: Samuli Piippo <samuli.piippo@digia.com>
 Date: Fri, 9 May 2014 10:23:50 +0300
 Subject: [PATCH] Updated kernel arguments for sabre sd
@@ -9,18 +9,15 @@ Subject: [PATCH] Updated kernel arguments for sabre sd
  1 file changed, 2 insertions(+)
 
 diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h
-index a8746a4..251b28b 100644
+index 03d4f34904..50e84d144f 100644
 --- a/include/configs/mx6sabre_common.h
 +++ b/include/configs/mx6sabre_common.h
-@@ -171,6 +171,8 @@
+@@ -111,6 +111,8 @@
                 "done\0" \
         "mmcargs=setenv bootargs console=${console},${baudrate} " \
-                "root=${mmcroot} " \
+                "root=PARTUUID=${uuid} rootwait rw " \
 +               "consoleblank=0 " \
 +               "vt.global_cursor_default=0 " \
                 VIDEO_ARGS "\0" \
         "loadbootscript=" \
                 "fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
--- 
-1.9.1
-
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-fslc/0001-Use-hdmi-as-primary-display-only-if-connected.patch b/meta-fsl-extras/recipes/u-boot/u-boot-fslc/0001-Use-hdmi-as-primary-display-only-if-connected.patch
deleted file mode 100644
index ddd90c6..0000000
--- a/meta-fsl-extras/recipes/u-boot/u-boot-fslc/0001-Use-hdmi-as-primary-display-only-if-connected.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 734ccf82db363efddb960b1c4f7db4081f2fdd7c Mon Sep 17 00:00:00 2001
-From: Samuli Piippo <samuli.piippo@theqtcompany.com>
-Date: Thu, 18 Feb 2016 12:49:01 +0200
-Subject: [PATCH] Use hdmi as primary display only if connected
-
-Test if HDMI display is connected before setting it as primary display.
-Otherwise set lvds as primary display. Test can be overridden by
-setting video_interfaces env.
----
- include/configs/mx6sabre_common.h | 10 +++++++++-
- 1 file changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h
-index a8746a4..485f232 100644
---- a/include/configs/mx6sabre_common.h
-+++ b/include/configs/mx6sabre_common.h
-@@ -163,8 +163,16 @@
-        "video_args_lcd=setenv video_args $video_args " \
-                "video=mxcfb${fb}:dev=lcd,CLAA-WVGA,if=RGB666\0" \
-        "fb=0\0" \
--       "video_interfaces=hdmi lvds lcd\0" \
-+       "video_interfaces=\0" \
-        "video_args_script=" \
-+        "if test -z \"${video_interfaces}\"; then " \
-+            "i2c dev 1; " \
-+            "if i2c probe 0x50; then " \
-+                  "setenv video_interfaces hdmi lvds lcd; " \
-+            "else " \
-+                  "setenv video_interfaces lvds hdmi lcd; " \
-+            "fi; " \
-+        "fi; " \
-                "for v in ${video_interfaces}; do " \
-                        "run video_args_${v}; " \
-                        "setexpr fb $fb + 1; " \
--- 
-1.9.1
-
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
deleted file mode 100644
index e8a0573..0000000
--- a/meta-fsl-extras/recipes/u-boot/u-boot-fslc/0001-use-imx7d-warp.dtb.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From ef2f2eeef6974bda0fd878c5f76b8b05ac16aa3d 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 b3e1f2e..edbd43f 100644
---- a/include/configs/warp7.h
-+++ b/include/configs/warp7.h
-@@ -35,7 +35,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=0x83000000\0" \
-        "boot_fdt=try\0" \
-        "ip_dyn=yes\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 b1df421..f17045d 100644
--- a/meta-fsl-extras/recipes/u-boot/u-boot-fslc_%.bbappend
+++ b/meta-fsl-extras/recipes/u-boot/u-boot-fslc_%.bbappend
@@ -1,6 +1,6 @@
 ############################################################################
 ##
-## Copyright (C) 2016 The Qt Company Ltd.
+## Copyright (C) 2018 The Qt Company Ltd.
 ## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
@@ -30,6 +30,4 @@
 FILESEXTRAPATHS_append := "${THISDIR}/${PN}:"
 SRC_URI += " \
         file://0001-Updated-kernel-arguments-for-sabre-sd.patch \
-        file://0001-Use-hdmi-as-primary-display-only-if-connected.patch \
-        file://0001-use-imx7d-warp.dtb.patch \
         "