Merge remote-tracking branch 'origin/sumo' into thud

* origin/sumo:
  qtdeviceutilities: update to latest revision
  renesas: update webengine workaround
  gammaray: update revision
  imx8: update meta layer
  meta-qt5: update layer
  meta-intel: update layer

Change-Id: I0d49cda55869c8848559b2250561a5101937b71d

6 files changed, 148 insertions, 38 deletions

diff --git a/meta-boot2qt-distro/conf/bblayers.conf.toradex-imx8.sample b/meta-boot2qt-distro/conf/bblayers.conf.toradex-imx8.sample
new file mode 100644
index 00000000..db166212
--- /dev/null
+++ b/meta-boot2qt-distro/conf/bblayers.conf.toradex-imx8.sample
@@ -0,0 +1,55 @@
+############################################################################
+##
+## Copyright (C) 2019 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$
+##
+############################################################################
+
+# POKY_BBLAYERS_CONF_VERSION is increased each time build/conf/bblayers.conf
+# changes incompatibly
+POKY_BBLAYERS_CONF_VERSION = "2"
+
+BBPATH = "${TOPDIR}"
+BBFILES ?= ""
+BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE')) + '/../..')}"
+
+BBLAYERS ?= " \
+  ${BSPDIR}/sources/poky/meta \
+  ${BSPDIR}/sources/poky/meta-poky \
+  ${BSPDIR}/sources/meta-fsl-bsp-release-toradex/imx/meta-bsp \
+  ${BSPDIR}/sources/meta-fsl-bsp-release-toradex/imx/meta-sdk \
+  ${BSPDIR}/sources/meta-freescale \
+  ${BSPDIR}/sources/meta-freescale-3rdparty \
+  ${BSPDIR}/sources/meta-openembedded/meta-oe \
+  ${BSPDIR}/sources/meta-openembedded/meta-python \
+  ${BSPDIR}/sources/meta-openembedded/meta-networking \
+  ${BSPDIR}/sources/meta-openembedded/meta-initramfs \
+  ${BSPDIR}/sources/meta-openembedded/meta-multimedia \
+  ${BSPDIR}/sources/meta-boot2qt/meta-boot2qt \
+  ${BSPDIR}/sources/meta-boot2qt/meta-boot2qt-distro \
+  ${BSPDIR}/sources/meta-boot2qt/meta-fsl-extras \
+  ${BSPDIR}/sources/meta-mingw \
+  ${BSPDIR}/sources/meta-qt5 \
+  "
diff --git a/meta-boot2qt-distro/conf/distro/include/apalis-imx8.conf b/meta-boot2qt-distro/conf/distro/include/apalis-imx8.conf
index 7a7728c2..833af446 100644
--- a/meta-boot2qt-distro/conf/distro/include/apalis-imx8.conf
+++ b/meta-boot2qt-distro/conf/distro/include/apalis-imx8.conf
@@ -1,6 +1,6 @@
 ############################################################################
 ##
-## Copyright (C) 2018 The Qt Company Ltd.
+## Copyright (C) 2019 The Qt Company Ltd.
 ## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
@@ -29,6 +29,11 @@
 
 include conf/distro/include/fsl-imx8.inc
 
+FSL_EULA_FILE := "${COREBASE}/../meta-fsl-bsp-release-toradex/imx/EULA.txt"
+
 DEPLOY_CONF_NAME = "Toradex Apalis iMX8"
 
-SERIAL_CONSOLE = "115200 ttyLP1"
+IMAGE_BOOT_FILES += "\
+    dpfw.bin \
+    hdmitxfw.bin \
+    "
diff --git a/meta-boot2qt-distro/conf/distro/include/colibri-imx8qxp.conf b/meta-boot2qt-distro/conf/distro/include/colibri-imx8qxp.conf
new file mode 100644
index 00000000..2b900c14
--- /dev/null
+++ b/meta-boot2qt-distro/conf/distro/include/colibri-imx8qxp.conf
@@ -0,0 +1,34 @@
+############################################################################
+##
+## Copyright (C) 2019 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$
+##
+############################################################################
+
+include conf/distro/include/fsl-imx8.inc
+
+FSL_EULA_FILE := "${COREBASE}/../meta-fsl-bsp-release-toradex/imx/EULA.txt"
+
+DEPLOY_CONF_NAME = "Toradex Colibri iMX8QXP"
diff --git a/meta-boot2qt-distro/conf/distro/include/fsl-imx8.inc b/meta-boot2qt-distro/conf/distro/include/fsl-imx8.inc
index 2ad63f5a..9d17aa3c 100644
--- a/meta-boot2qt-distro/conf/distro/include/fsl-imx8.inc
+++ b/meta-boot2qt-distro/conf/distro/include/fsl-imx8.inc
@@ -1,6 +1,6 @@
 ############################################################################
 ##
-## Copyright (C) 2018 The Qt Company Ltd.
+## Copyright (C) 2019 The Qt Company Ltd.
 ## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
@@ -28,52 +28,32 @@
 ############################################################################
 
 include conf/distro/include/fsl.inc
+include conf/distro/include/fsl-imx-preferred-env.inc
 
 FSL_EULA_FILE := "${COREBASE}/../meta-fsl-bsp-release/imx/EULA.txt"
 
 DISTRO_FEATURES_remove = "vulkan"
 
-RDEPENDS_gstreamer1.0-meta-base_remove_pn-gstreamer1.0-meta-base = " gstreamer1.0-plugins-good-souphttpsrc"
-RDEPENDS_gstreamer1.0-meta-base_append_pn-gstreamer1.0-meta-base = " gstreamer1.0-plugins-good-soup"
-
 BBMASK += "\
-    meta-boot2qt-distro/recipes-connectivity/connman/connman_%.bbappend \
     meta-boot2qt/meta-fsl-extras/recipes/u-boot/u-boot-toradex_%.bbappend \
-    meta-freescale/recipes-graphics/wayland/weston \
-    meta-fsl-bsp-release/imx/meta-bsp/recipes-browser \
-    meta-fsl-bsp-release/imx/meta-bsp/recipes-bsp/imx-test \
-    meta-fsl-bsp-release/imx/meta-bsp/recipes-connectivity/bluez5 \
-    meta-fsl-bsp-release/imx/meta-bsp/recipes-connectivity/connman \
-    meta-fsl-bsp-release/imx/meta-bsp/recipes-connectivity/nfs-utils \
-    meta-fsl-bsp-release/imx/meta-bsp/recipes-connectivity/wpa-supplicant \
-    meta-fsl-bsp-release/imx/meta-bsp/recipes-core/systemd/systemd_%.bbappend \
-    meta-fsl-bsp-release/imx/meta-bsp/recipes-devtools/gdb \
-    meta-fsl-bsp-release/imx/meta-bsp/recipes-extended/logrotate \
-    meta-fsl-bsp-release/imx/meta-bsp/recipes-graphics/opencv \
-    meta-fsl-bsp-release/imx/meta-bsp/recipes-graphics/xorg-driver \
-    meta-fsl-bsp-release/imx/meta-bsp/recipes-kernel/cryptodev \
-    meta-fsl-bsp-release/imx/meta-bsp/recipes-multimedia/alsa \
-    meta-fsl-bsp-release/imx/meta-bsp/recipes-multimedia/pulseaudio \
-    meta-fsl-bsp-release/imx/meta-sdk/recipes-fsl/fsl-rc-local \
-    meta-fsl-bsp-release/imx/meta-sdk/recipes-fsl/images \
-    meta-fsl-bsp-release/imx/meta-sdk/recipes-fsl/packagegroup \
-    meta-fsl-bsp-release/imx/meta-sdk/recipes-graphics/devil \
-    meta-fsl-bsp-release/imx/meta-sdk/recipes-qt5/qt5 \
+    meta-freescale/recipes-graphics/drm/libdrm_%.bbappend \
+    imx/meta-bsp/recipes-browser \
+    imx/meta-sdk/recipes-fsl/fsl-rc-local \
+    imx/meta-sdk/recipes-fsl/images \
+    imx/meta-sdk/recipes-fsl/packagegroup/packagegroup-fsl-gstreamer1.0.bbappend \
+    imx/meta-sdk/recipes-fsl/packagegroup/packagegroup-fsl-tools-gpu.bbappend \
+    imx/meta-sdk/recipes-fsl/packagegroup/packagegroup-fsl-tools-testapps.bbappend \
+    imx/meta-sdk/recipes-graphics/devil \
+    imx/meta-sdk/dynamic-layers/qt5-layer \
     "
 
 KERNEL_MODULE_PACKAGE_SUFFIX ?= "-${@d.getVar('KERNEL_VERSION').replace('_','-')}"
-EXTRA_OECONF_append_pn-gstreamer1.0-plugins-base = " --disable-introspection"
-
-MACHINE_GSTREAMER_1_0_PLUGIN += "imx-gst1.0-plugin"
 
-WKS_FILE = "imx8-uboot-bootpart.wks"
+WKS_FILE = "imx8-uboot-bootpart.wks.in"
 WIC_CREATE_EXTRA_ARGS = "--no-fstab-update"
 WKS_FILE_DEPENDS += "imx-boot"
 
-BOOT_CONFIG_MACHINE_pn-imx-boot = "${BOOT_NAME}-${UBOOT_CONFIG}.bin"
-
 IMAGE_BOOT_FILES = "\
     Image \
     fsl-*.dtb \
-    hdmitxfw.bin \
     "
diff --git a/meta-boot2qt-distro/conf/distro/include/imx8qmlpddr4arm2.conf b/meta-boot2qt-distro/conf/distro/include/imx8mqevk.conf
index a3a2c29a..573d516f 100644
--- a/meta-boot2qt-distro/conf/distro/include/imx8qmlpddr4arm2.conf
+++ b/meta-boot2qt-distro/conf/distro/include/imx8mqevk.conf
@@ -1,6 +1,6 @@
 ############################################################################
 ##
-## Copyright (C) 2018 The Qt Company Ltd.
+## Copyright (C) 2019 The Qt Company Ltd.
 ## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
@@ -29,6 +29,4 @@
 
 include conf/distro/include/fsl-imx8.inc
 
-DEPLOY_CONF_NAME = "NXP iMX8QM"
-
-PREFERRED_PROVIDER_virtual/bootloader = "u-boot-imx"
+DEPLOY_CONF_NAME = "NXP i.MX 8MQuad EVK"
diff --git a/meta-boot2qt-distro/conf/distro/include/imx8qmmek.conf b/meta-boot2qt-distro/conf/distro/include/imx8qmmek.conf
new file mode 100644
index 00000000..21186653
--- /dev/null
+++ b/meta-boot2qt-distro/conf/distro/include/imx8qmmek.conf
@@ -0,0 +1,38 @@
+############################################################################
+##
+## Copyright (C) 2019 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$
+##
+############################################################################
+
+include conf/distro/include/fsl-imx8.inc
+
+DEPLOY_CONF_NAME = "NXP i.MX 8QuadMax MEK"
+
+IMAGE_BOOT_FILES += "\
+    dpfw.bin \
+    hdmirxfw.bin \
+    hdmitxfw.bin \
+    "