freescale: update meta-freecale to master

Use the latest revision of meta-freecale/mater for all imx boards,
dropping meta-fsl-bsp-release layer used for imx8 boards. Need to
use master branch, since warrior does not have support for the
latest chipset revisions.

Remove unneeded bbappends and fix builds with older opencv.

Change-Id: I73035978bf6ddba51c1204accfe5171e26527fa9
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>

25 files changed, 42 insertions, 549 deletions

diff --git a/b2qt-init-build-env b/b2qt-init-build-env
index dbb0ab65..00008d31 100755
--- a/b2qt-init-build-env
+++ b/b2qt-init-build-env
@@ -148,17 +148,14 @@ get_groups() {
       all)
         PROJECT_GROUPS="external"
         ;;
-      imx8*)
-        PROJECT_GROUPS="fsl-imx8"
-        ;;
       apalis-*|colibri-*)
-        PROJECT_GROUPS="toradex"
+        PROJECT_GROUPS="toradex freescale"
         ;;
       nitrogen6x|nitrogen7|nitrogen8m|nitrogen8mm)
-        PROJECT_GROUPS="boundary"
+        PROJECT_GROUPS="boundary freescale"
         ;;
-      imx6qdlsabresd|imx7dsabresd|imx7s-warp)
-        PROJECT_GROUPS="fsl"
+      imx*)
+        PROJECT_GROUPS="freescale"
         ;;
       raspberrypi*)
         PROJECT_GROUPS="rpi"
diff --git a/meta-boot2qt-distro/conf/bblayers.conf.fsl-imx8.sample b/meta-boot2qt-distro/conf/bblayers.conf.fsl-imx8.sample
deleted file mode 100644
index 4dedae1a..00000000
--- a/meta-boot2qt-distro/conf/bblayers.conf.fsl-imx8.sample
+++ /dev/null
@@ -1,54 +0,0 @@
-############################################################################
-##
-## Copyright (C) 2018 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/imx/meta-bsp \
-  ${BSPDIR}/sources/meta-fsl-bsp-release/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-mingw \
-  ${BSPDIR}/sources/meta-qt5 \
-  "
diff --git a/meta-boot2qt-distro/conf/distro/include/fsl-imx8.inc b/meta-boot2qt-distro/conf/distro/include/fsl-imx8.inc
deleted file mode 100644
index 56a34128..00000000
--- a/meta-boot2qt-distro/conf/distro/include/fsl-imx8.inc
+++ /dev/null
@@ -1,78 +0,0 @@
-############################################################################
-##
-## 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.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"
-
-BBMASK += "\
-    meta-freescale/recipes-graphics/drm/libdrm_%.bbappend \
-    imx/meta-bsp/recipes-browser \
-    imx/meta-bsp/recipes-connectivity/nfs-utils \
-    imx/meta-bsp/recipes-connectivity/wpa-supplicant \
-    imx/meta-bsp/recipes-core/systemd/systemd_%.bbappend \
-    imx/meta-bsp/recipes-graphics/cantarell-fonts \
-    imx/meta-bsp/recipes-multimedia/alsa/alsa-lib_%.bbappend \
-    imx/meta-bsp/recipes-multimedia/gstreamer \
-    imx/meta-bsp/recipes-multimedia/pulseaudio \
-    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 \
-    meta-openembedded/meta-oe/recipes-core/opencl-headers \
-    "
-
-PREFERRED_VERSION_gstreamer1.0-plugins-base = "1.14.imx"
-PREFERRED_VERSION_gstreamer1.0-plugins-bad  = "1.14.imx"
-PREFERRED_VERSION_gstreamer1.0-plugins-good = "1.14.imx"
-PREFERRED_VERSION_gstreamer1.0              = "1.14.imx"
-
-# match linux-imx kernel versions
-PREFERRED_VERSION_linux-libc-headers_imx = "4.14.98"
-PV_pn-linux-libc-headers = "4.14.98"
-
-KERNEL_MODULE_PACKAGE_SUFFIX ?= "-${@d.getVar('KERNEL_VERSION').replace('_','-')}"
-
-WKS_FILE = "imx8-uboot-bootpart.wks.in"
-WIC_CREATE_EXTRA_ARGS = "--no-fstab-update"
-WKS_FILE_DEPENDS += "imx-boot"
-
-IMAGE_BOOT_FILES = "\
-    Image \
-    fsl-*.dtb \
-    "
-
-HOST_CC_ARCH_append_pn-optee-client-imx = " -U_FORTIFY_SOURCE -Wno-error=format-truncation"
-HOST_CC_ARCH_append_pn-optee-test-imx = " -Wno-error=array-bounds -Wno-error=stringop-overflow"
diff --git a/meta-boot2qt-distro/conf/distro/include/fsl.inc b/meta-boot2qt-distro/conf/distro/include/fsl.inc
index 5f22dd40..1bfbc276 100644
--- a/meta-boot2qt-distro/conf/distro/include/fsl.inc
+++ b/meta-boot2qt-distro/conf/distro/include/fsl.inc
@@ -1,6 +1,6 @@
 ############################################################################
 ##
-## Copyright (C) 2016 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.
@@ -27,12 +27,22 @@
 ##
 ############################################################################
 
-BBMASK += "meta-freescale/dynamic-layers/qt5-layer/recipes-qt/qt5"
+BBMASK += "\
+    meta-freescale/dynamic-layers/qt5-layer/recipes-qt/qt5 \
+    meta-freescale/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv_4.%.bbappend \
+    meta-freescale/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.16.%.bbappend \
+"
 
 IMAGE_FSTYPES += "ext3 wic"
-IMAGE_CLASSES += "image_types_fsl"
 
 QBSP_IMAGE_CONTENT ?= "\
     ${IMAGE_LINK_NAME}.img \
     ${IMAGE_LINK_NAME}.conf \
     "
+
+# Use gstreamer 1.14 from meta-freescale
+PREFERRED_VERSION_gstreamer1.0 ?= "1.14.imx"
+PREFERRED_VERSION_gstreamer1.0-plugins-base ?= "1.14.imx"
+PREFERRED_VERSION_gstreamer1.0-plugins-good ?= "1.14.imx"
+PREFERRED_VERSION_gstreamer1.0-plugins-bad ?= "1.14.imx"
+PREFERRED_VERSION_gstreamer1.0-libav ?= "1.14.0"
diff --git a/meta-boot2qt-distro/conf/distro/include/imx8mqevk.conf b/meta-boot2qt-distro/conf/distro/include/imx8mqevk.conf
index 573d516f..eaa8150f 100644
--- a/meta-boot2qt-distro/conf/distro/include/imx8mqevk.conf
+++ b/meta-boot2qt-distro/conf/distro/include/imx8mqevk.conf
@@ -27,6 +27,6 @@
 ##
 ############################################################################
 
-include conf/distro/include/fsl-imx8.inc
+include conf/distro/include/fsl.inc
 
 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
index 21186653..2e64f1f2 100644
--- a/meta-boot2qt-distro/conf/distro/include/imx8qmmek.conf
+++ b/meta-boot2qt-distro/conf/distro/include/imx8qmmek.conf
@@ -27,12 +27,8 @@
 ##
 ############################################################################
 
-include conf/distro/include/fsl-imx8.inc
+include conf/distro/include/fsl.inc
 
 DEPLOY_CONF_NAME = "NXP i.MX 8QuadMax MEK"
 
-IMAGE_BOOT_FILES += "\
-    dpfw.bin \
-    hdmirxfw.bin \
-    hdmitxfw.bin \
-    "
+IMX_BOOT_SEEK = "32"
diff --git a/meta-boot2qt-distro/conf/distro/include/imx8qxpmek.conf b/meta-boot2qt-distro/conf/distro/include/imx8qxpmek.conf
index 3445d5c2..4fb0368f 100644
--- a/meta-boot2qt-distro/conf/distro/include/imx8qxpmek.conf
+++ b/meta-boot2qt-distro/conf/distro/include/imx8qxpmek.conf
@@ -27,6 +27,6 @@
 ##
 ############################################################################
 
-include conf/distro/include/fsl-imx8.inc
+include conf/distro/include/fsl.inc
 
 DEPLOY_CONF_NAME = "NXP i.MX 8QuadXPlus MEK"
diff --git a/meta-boot2qt-distro/conf/distro/include/nitrogen8mm.conf b/meta-boot2qt-distro/conf/distro/include/nitrogen8mm.conf
index 5ba89bc0..b72fb76b 100644
--- a/meta-boot2qt-distro/conf/distro/include/nitrogen8mm.conf
+++ b/meta-boot2qt-distro/conf/distro/include/nitrogen8mm.conf
@@ -31,3 +31,5 @@ include conf/distro/include/boundary.inc
 
 DEPLOY_CONF_NAME = "Boundary Devices i.MX8MM"
 
+# cortexa53-crypto from meta-freescale is not compatible with oe-core/warrior
+DEFAULTTUNE_mx8mm = "aarch64"
diff --git a/meta-boot2qt-distro/conf/distro/include/toradex.inc b/meta-boot2qt-distro/conf/distro/include/toradex.inc
index 9f622e61..cd00528c 100644
--- a/meta-boot2qt-distro/conf/distro/include/toradex.inc
+++ b/meta-boot2qt-distro/conf/distro/include/toradex.inc
@@ -41,7 +41,7 @@ BBMASK_append_mx6 = "\
     meta-toradex-nxp/recipes-graphics/wayland/weston_4.0.0.imx.bbappend \
 "
 
-PREFERRED_VERSION_wayland-protocols_mx6 = "1.16.imx"
+PREFERRED_VERSION_wayland-protocols_mx8 = "1.17.imx"
 
 WKS_FILE_DEPENDS_append_mx6 = " u-boot-script-toradex"
 WKS_FILE_DEPENDS_append_mx7 = " u-boot-script-toradex"
diff --git a/meta-boot2qt-distro/dynamic-layers/freescale-layer/recipes-bsp/firmware-imx/firmware-imx.inc b/meta-boot2qt-distro/dynamic-layers/freescale-layer/recipes-bsp/firmware-imx/firmware-imx.inc
deleted file mode 100644
index 5407a5a1..00000000
--- a/meta-boot2qt-distro/dynamic-layers/freescale-layer/recipes-bsp/firmware-imx/firmware-imx.inc
+++ /dev/null
@@ -1,81 +0,0 @@
-SUMMARY = "Freescale IMX firmware"
-DESCRIPTION = "Freescale IMX firmware such as for the VPU"
-SECTION = "base"
-LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://COPYING;md5=8cf95184c220e247b9917e7244124c5a"
-
-PE = "1"
-
-#BRCM firmware git
-SRCBRANCH ?= "master"
-
-SRC_URI = "${FSL_MIRROR}/firmware-imx-${PV}.bin;fsl-eula=true \
-           git://git.freescale.com/imx/imx-firmware.git;branch=${SRCBRANCH};destsuffix=${S}/git "
-
-inherit fsl-eula-unpack allarch
-
-do_install() {
-    install -d ${D}${base_libdir}/firmware/imx
-    install -d ${D}${base_libdir}/firmware/bcm
-    install -d ${D}${sysconfdir}/firmware
-
-    cp -rfv firmware/* ${D}${base_libdir}/firmware/
-
-    #1BW_BCM43340
-    install -d ${D}${base_libdir}/firmware/bcm/1BW_BCM43340
-    cp -rfv git/brcm/1BW_BCM43340/*.bin ${D}${base_libdir}/firmware/bcm/1BW_BCM43340
-    cp -rfv git/brcm/1BW_BCM43340/*.cal ${D}${base_libdir}/firmware/bcm/1BW_BCM43340
-    cp -rfv git/brcm/1BW_BCM43340/*.hcd ${D}${sysconfdir}/firmware/
-
-    #1DX_BCM4343W
-    install -d ${D}${base_libdir}/firmware/bcm/1DX_BCM4343W
-    cp -rfv git/brcm/1DX_BCM4343W/*.bin ${D}${base_libdir}/firmware/bcm/1DX_BCM4343W
-    cp -rfv git/brcm/1DX_BCM4343W/*.cal ${D}${base_libdir}/firmware/bcm/1DX_BCM4343W
-    cp -rfv git/brcm/1DX_BCM4343W/*.hcd ${D}${sysconfdir}/firmware/
-
-    #SN8000_BCM43362
-    install -d ${D}${base_libdir}/firmware/bcm/SN8000_BCM43362
-    cp -rfv git/brcm/SN8000_BCM43362/*.bin ${D}${base_libdir}/firmware/bcm/SN8000_BCM43362
-    cp -rfv git/brcm/SN8000_BCM43362/*.cal ${D}${base_libdir}/firmware/bcm/SN8000_BCM43362
-    cp -rfv git/brcm/1DX_BCM4343W/*.hcd ${D}${sysconfdir}/firmware/
-
-    #ZP_BCM4339
-    install -d ${D}${base_libdir}/firmware/bcm/ZP_BCM4339
-    cp -rfv git/brcm/ZP_BCM4339/*.bin ${D}${base_libdir}/firmware/bcm/ZP_BCM4339
-    cp -rfv git/brcm/ZP_BCM4339/*.cal ${D}${base_libdir}/firmware/bcm/ZP_BCM4339
-    cp -rfv git/brcm/ZP_BCM4339/*.hcd ${D}${sysconfdir}/firmware/
-
-    mv ${D}${base_libdir}/firmware/epdc/ ${D}${base_libdir}/firmware/imx/epdc/
-    mv ${D}${base_libdir}/firmware/imx/epdc/epdc_ED060XH2C1.fw.nonrestricted ${D}${base_libdir}/firmware/imx/epdc/epdc_ED060XH2C1.fw
-
-    find ${D}${base_libdir}/firmware -type f -exec chmod 644 '{}' ';'
-    find ${D}${base_libdir}/firmware -type f -exec chown root:root '{}' ';'
-
-    # Remove files not going to be installed
-    find ${D}${base_libdir}/firmware/ -name '*.mk' -exec rm '{}' ';'
-}
-
-python populate_packages_prepend() {
-    vpudir = bb.data.expand('${base_libdir}/firmware/vpu', d)
-    do_split_packages(d, vpudir, '^vpu_fw_([^_]*).*\.bin',
-                      output_pattern='firmware-imx-vpu-%s',
-                      description='Freescale IMX Firmware %s',
-                      extra_depends='',
-                      prepend=True)
-
-    sdmadir = bb.data.expand('${base_libdir}/firmware/sdma', d)
-    do_split_packages(d, sdmadir, '^sdma-([^-]*).*\.bin',
-                      output_pattern='firmware-imx-sdma-%s',
-                      description='Freescale IMX Firmware %s',
-                      extra_depends='',
-                      prepend=True)
-}
-
-ALLOW_EMPTY_${PN} = "1"
-
-PACKAGES_DYNAMIC = "${PN}-vpu-* ${PN}-sdma-*"
-
-PACKAGES =+ "${PN}-epdc ${PN}-brcm"
-
-FILES_${PN}-epdc = "${base_libdir}/firmware/imx/epdc/"
-FILES_${PN}-brcm = "${base_libdir}/firmware/bcm/*/*.bin ${base_libdir}/firmware/bcm/*/*.cal ${sysconfdir}/firmware/"
diff --git a/meta-boot2qt-distro/dynamic-layers/freescale-layer/recipes-bsp/imx-vpu/imx-vpu.inc b/meta-boot2qt-distro/dynamic-layers/freescale-layer/recipes-bsp/imx-vpu/imx-vpu.inc
deleted file mode 100644
index 7b339565..00000000
--- a/meta-boot2qt-distro/dynamic-layers/freescale-layer/recipes-bsp/imx-vpu/imx-vpu.inc
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright (C) 2013-2017 O.S. Systems Software LTDA.
-# Copyright (C) 2013 Freescale Semiconductor
-# Copyright 2017 NXP
-
-DESCRIPTION = "Freescale VPU library"
-LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://vpu/EULA.txt;md5=b063366b066c9f10037c59756a9ced54"
-DEPENDS = "virtual/kernel"
-
-PROVIDES = "virtual/imxvpu"
-
-inherit fsl-eula-unpack
-
-PLATFORM_mx6 = "IMX6Q"
-
-SRC_URI = "${FSL_MIRROR}/${PN}-${PV}.bin;fsl-eula=true"
-
-do_compile () {
-    INCLUDE_DIR="-I${STAGING_KERNEL_DIR}/include/uapi -I${STAGING_KERNEL_DIR}/include"
-
-    oe_runmake CROSS_COMPILE="${HOST_PREFIX}" PLATFORM="${PLATFORM}" INCLUDE="${INCLUDE_DIR}" all
-}
-
-do_install () {
-    oe_runmake PLATFORM="${PLATFORM}" DEST_DIR="${D}" install
-}
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/meta-boot2qt-distro/dynamic-layers/freescale-layer/recipes-graphics/imx-dpu-g2d/imx-dpu-g2d_%.bbappend b/meta-boot2qt-distro/dynamic-layers/freescale-layer/recipes-graphics/imx-dpu-g2d/imx-dpu-g2d_%.bbappend
deleted file mode 100644
index 4a998742..00000000
--- a/meta-boot2qt-distro/dynamic-layers/freescale-layer/recipes-graphics/imx-dpu-g2d/imx-dpu-g2d_%.bbappend
+++ /dev/null
@@ -1,31 +0,0 @@
-############################################################################
-##
-## Copyright (C) 2018 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$
-##
-############################################################################
-
-# dependency missing in meta-fsl-bsp-release
-RDEPENDS_${PN} += "libdrm"
diff --git a/meta-boot2qt-distro/dynamic-layers/freescale-layer/recipes-graphics/libsdl2/libsdl2_%.bbappend b/meta-boot2qt-distro/dynamic-layers/freescale-layer/recipes-graphics/libsdl2/libsdl2_%.bbappend
deleted file mode 100644
index 4d6a52be..00000000
--- a/meta-boot2qt-distro/dynamic-layers/freescale-layer/recipes-graphics/libsdl2/libsdl2_%.bbappend
+++ /dev/null
@@ -1,30 +0,0 @@
-############################################################################
-##
-## Copyright (C) 2018 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$
-##
-############################################################################
-
-CFLAGS += "-DLINUX=1 -DEGL_API_FB=1"
diff --git a/meta-boot2qt-distro/dynamic-layers/freescale-layer/recipes-kernel/linux-firmware/linux-firmware_git.bbappend b/meta-boot2qt-distro/dynamic-layers/freescale-layer/recipes-kernel/linux-firmware/linux-firmware_git.bbappend
deleted file mode 100644
index 932a4ec9..00000000
--- a/meta-boot2qt-distro/dynamic-layers/freescale-layer/recipes-kernel/linux-firmware/linux-firmware_git.bbappend
+++ /dev/null
@@ -1,38 +0,0 @@
-############################################################################
-##
-## 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$
-##
-############################################################################
-
-# Package firmware-qca6174 wants to install file .../etc/bluetooth/firmware.conf
-# But that file is already provided by package  * linux-firmware-qca
-do_install_append () {
-    rm -f ${D}${sysconfdir}/bluetooth/firmware.conf
-}
-
-FILES_${PN}-qca_remove = " \
-  ${sysconfdir}/bluetooth/firmware.conf \
-"
diff --git a/meta-boot2qt-distro/dynamic-layers/freescale-layer/recipes-kernel/linux/linux-imx_4.%.bbappend b/meta-boot2qt-distro/dynamic-layers/freescale-layer/recipes-kernel/linux/linux-imx_4.%.bbappend
index 9b4cc9b9..93302cc1 100644
--- a/meta-boot2qt-distro/dynamic-layers/freescale-layer/recipes-kernel/linux/linux-imx_4.%.bbappend
+++ b/meta-boot2qt-distro/dynamic-layers/freescale-layer/recipes-kernel/linux/linux-imx_4.%.bbappend
@@ -1,6 +1,6 @@
 ############################################################################
 ##
-## Copyright (C) 2016 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.
@@ -30,9 +30,6 @@
 # kernel image files are not needed in the image
 RDEPENDS_${KERNEL_PACKAGE_NAME}-base = ""
 
-# remove from imx8 kernel build
-SRC_URI_remove = " file://Install-dma-buf-h.patch"
-
 do_preconfigure_prepend() {
     # FunctionFS for qdbd
     echo "CONFIG_USB_FUNCTIONFS=m"  >> ${WORKDIR}/defconfig
diff --git a/meta-boot2qt-distro/dynamic-layers/freescale-layer/recipes-multimedia/gstreamer/gstreamer1.0-libav.inc b/meta-boot2qt-distro/dynamic-layers/freescale-layer/recipes-multimedia/gstreamer/gstreamer1.0-libav.inc
deleted file mode 100644
index c2283061..00000000
--- a/meta-boot2qt-distro/dynamic-layers/freescale-layer/recipes-multimedia/gstreamer/gstreamer1.0-libav.inc
+++ /dev/null
@@ -1,51 +0,0 @@
-SUMMARY = "Libav-based GStreamer 1.x plugin"
-HOMEPAGE = "http://gstreamer.freedesktop.org/"
-SECTION = "multimedia"
-
-LICENSE = "GPLv2+ & LGPLv2+ & ( (GPLv2+ & LGPLv2.1+) | (GPLv3+ & LGPLv3+) )"
-LICENSE_FLAGS = "commercial"
-
-DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base zlib bzip2 xz"
-
-inherit autotools pkgconfig upstream-version-is-even gtk-doc
-
-# CAUTION: Using the system libav is not recommended. Since the libav API is changing all the time,
-# compilation errors (and other, more subtle bugs) can happen. It is usually better to rely on the
-# libav copy included in the gst-libav package.
-PACKAGECONFIG ??= "orc yasm"
-
-PACKAGECONFIG[gpl] = "--enable-gpl,--disable-gpl,"
-PACKAGECONFIG[libav] = "--with-system-libav,,libav"
-PACKAGECONFIG[orc] = "--enable-orc,--disable-orc,orc"
-PACKAGECONFIG[yasm] = "--enable-yasm,--disable-yasm,yasm-native"
-PACKAGECONFIG[valgrind] = "--enable-valgrind,--disable-valgrind,valgrind"
-
-GSTREAMER_1_0_DEBUG ?= "--disable-debug"
-
-LIBAV_EXTRA_CONFIGURE = "--with-libav-extra-configure"
-
-LIBAV_EXTRA_CONFIGURE_COMMON_ARG = "--target-os=linux \
-  --cc='${CC}' --as='${CC}' --ld='${CC}' --nm='${NM}' --ar='${AR}' \
-  --ranlib='${RANLIB}' \
-  ${GSTREAMER_1_0_DEBUG} \
-  --cross-prefix='${HOST_PREFIX}'"
-
-# Disable assembly optimizations for X32, as this libav lacks the support
-PACKAGECONFIG_remove_linux-gnux32 = "yasm"
-LIBAV_EXTRA_CONFIGURE_COMMON_ARG_append_linux-gnux32 = " --disable-asm"
-
-LIBAV_EXTRA_CONFIGURE_COMMON = \
-'${LIBAV_EXTRA_CONFIGURE}="${LIBAV_EXTRA_CONFIGURE_COMMON_ARG}"'
-
-EXTRA_OECONF = "${LIBAV_EXTRA_CONFIGURE_COMMON}"
-
-FILES_${PN} += "${libdir}/gstreamer-1.0/*.so"
-FILES_${PN}-dev += "${libdir}/gstreamer-1.0/*.la"
-FILES_${PN}-staticdev += "${libdir}/gstreamer-1.0/*.a"
-
-# http://errors.yoctoproject.org/Errors/Details/20493/
-ARM_INSTRUCTION_SET_armv4 = "arm"
-ARM_INSTRUCTION_SET_armv5 = "arm"
-
-# ffmpeg/libav disables PIC on some platforms (e.g. x86-32)
-INSANE_SKIP_${PN} = "textrel"
diff --git a/meta-boot2qt-distro/dynamic-layers/freescale-layer/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.14.0.bb b/meta-boot2qt-distro/dynamic-layers/freescale-layer/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.14.0.bb
deleted file mode 100644
index 52b52781..00000000
--- a/meta-boot2qt-distro/dynamic-layers/freescale-layer/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.14.0.bb
+++ /dev/null
@@ -1,35 +0,0 @@
-############################################################################
-##
-## 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$
-##
-############################################################################
-
-require recipes-multimedia/gstreamer/gstreamer1.0-libav_1.14.4.bb
-
-FILESEXTRAPATHS_prepend := "${BSPDIR}/sources/poky/meta/recipes-multimedia/gstreamer/${PN}:"
-
-SRC_URI[md5sum] = "943045b9e937ffc5c6cfa0bd5c44230d"
-SRC_URI[sha256sum] = "fb134b4d3e054746ef8b922ff157b0c7903d1fdd910708a45add66954da7ef89"
diff --git a/meta-boot2qt-distro/dynamic-layers/freescale-layer/recipes-bsp/firmware-imx/firmware-imx_%.bbappend b/meta-boot2qt-distro/dynamic-layers/freescale-layer/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.14.imx.bbappend
index 9eb14b6d..beb62f6a 100644
--- a/meta-boot2qt-distro/dynamic-layers/freescale-layer/recipes-bsp/firmware-imx/firmware-imx_%.bbappend
+++ b/meta-boot2qt-distro/dynamic-layers/freescale-layer/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.14.imx.bbappend
@@ -27,5 +27,10 @@
 ##
 ############################################################################
 
-# need to use MACHINE_ARCH since the recipe deploys machine specific files
-PACKAGE_ARCH_mx8 = "${MACHINE_ARCH}"
+# patch is still available in meta-freescale
+SRC_URI += " \
+    file://0002-opencv-Fix-build-with-opencv-3.4.5.patch \
+"
+
+# depend on vulkan instead of vulkan-loader
+PACKAGECONFIG[vulkan]          = "--enable-vulkan,--disable-vulkan,vulkan"
diff --git a/meta-boot2qt-distro/dynamic-layers/freescale-layer/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.14.%.bbappend b/meta-boot2qt-distro/dynamic-layers/freescale-layer/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.14.%.bbappend
new file mode 100644
index 00000000..8565c6a5
--- /dev/null
+++ b/meta-boot2qt-distro/dynamic-layers/freescale-layer/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.14.%.bbappend
@@ -0,0 +1,3 @@
+PACKAGECONFIG_GL_imxgpu2d = "${@bb.utils.contains('DISTRO_FEATURES', 'opengl x11', 'opengl', '', d)}"
+PACKAGECONFIG_GL_imxgpu3d = "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gles2 egl', '', d)}"
+PACKAGECONFIG_GL_use-mainline-bsp = "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gles2 egl', '', d)}"
diff --git a/meta-boot2qt-distro/dynamic-layers/freescale-layer/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly.inc b/meta-boot2qt-distro/dynamic-layers/freescale-layer/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly.inc
deleted file mode 100644
index 1db3bc9b..00000000
--- a/meta-boot2qt-distro/dynamic-layers/freescale-layer/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly.inc
+++ /dev/null
@@ -1,31 +0,0 @@
-require recipes-multimedia/gstreamer/gstreamer1.0-plugins.inc
-
-LICENSE = "GPLv2+ & LGPLv2.1+ & LGPLv2+"
-LICENSE_FLAGS = "commercial"
-
-DEPENDS += "gstreamer1.0-plugins-base libid3tag"
-
-inherit gettext
-
-PACKAGECONFIG ??= " \
-    ${GSTREAMER_ORC} \
-    a52dec lame mpg123 mpeg2dec \
-"
-
-PACKAGECONFIG[a52dec]   = "--enable-a52dec,--disable-a52dec,liba52"
-PACKAGECONFIG[amrnb]    = "--enable-amrnb,--disable-amrnb,opencore-amr"
-PACKAGECONFIG[amrwb]    = "--enable-amrwb,--disable-amrwb,opencore-amr"
-PACKAGECONFIG[cdio]     = "--enable-cdio,--disable-cdio,libcdio"
-PACKAGECONFIG[dvdread]  = "--enable-dvdread,--disable-dvdread,libdvdread"
-PACKAGECONFIG[lame]     = "--enable-lame,--disable-lame,lame"
-PACKAGECONFIG[mpeg2dec] = "--enable-mpeg2dec,--disable-mpeg2dec,mpeg2dec"
-PACKAGECONFIG[mpg123]   = "--enable-mpg123,--disable-mpg123,mpg123"
-PACKAGECONFIG[x264]     = "--enable-x264,--disable-x264,x264"
-
-EXTRA_OECONF += " \
-    --disable-sidplay \
-    --disable-twolame \
-"
-
-FILES_${PN}-amrnb += "${datadir}/gstreamer-1.0/presets/GstAmrnbEnc.prs"
-FILES_${PN}-x264 += "${datadir}/gstreamer-1.0/presets/GstX264Enc.prs"
diff --git a/meta-boot2qt-distro/dynamic-layers/freescale-layer/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.14.0.bb b/meta-boot2qt-distro/dynamic-layers/freescale-layer/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.14.0.bb
deleted file mode 100644
index ebc1da0f..00000000
--- a/meta-boot2qt-distro/dynamic-layers/freescale-layer/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.14.0.bb
+++ /dev/null
@@ -1,35 +0,0 @@
-############################################################################
-##
-## 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$
-##
-############################################################################
-
-require recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.14.4.bb
-
-FILESEXTRAPATHS_prepend := "${BSPDIR}/sources/poky/meta/recipes-multimedia/gstreamer/files:"
-
-SRC_URI[md5sum] = "bcb1f8d9339176aee2b5da2a9cb2df88"
-SRC_URI[sha256sum] = "3fb9ea5fc8a2de4b3eaec4128d71c6a2d81dd19befe1cd87cb833b98bcb542d1"
diff --git a/meta-boot2qt-distro/dynamic-layers/freescale-layer/recipes-support/opencv/opencv_3.4.%.bbappend b/meta-boot2qt-distro/dynamic-layers/freescale-layer/recipes-support/opencv/opencv_3.4.%.bbappend
new file mode 100644
index 00000000..2bae6470
--- /dev/null
+++ b/meta-boot2qt-distro/dynamic-layers/freescale-layer/recipes-support/opencv/opencv_3.4.%.bbappend
@@ -0,0 +1,3 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+PACKAGECONFIG_remove_imxgpu2d = "v4l"
diff --git a/meta-boot2qt-distro/wic/imx8-uboot-bootpart.wks.in b/meta-boot2qt-distro/wic/imx8-uboot-bootpart.wks.in
deleted file mode 100644
index fb79978c..00000000
--- a/meta-boot2qt-distro/wic/imx8-uboot-bootpart.wks.in
+++ /dev/null
@@ -1,19 +0,0 @@
-# short-description: Create SD card image with a boot partition
-# long-description:
-# Create an image that can be written onto a SD card using dd for use
-# with i.MX SoC family
-# It uses u-boot
-#
-# The disk layout used is:
-#  - --------- -------------- --------------
-# | | u-boot  |     boot     |    rootfs   |
-#  - --------- -------------- --------------
-# ^ ^         ^              ^
-# | |         |              |
-# 0 33kiB    4MiB          32MiB + rootfs + IMAGE_EXTRA_SPACE (default 10MiB)
-#
-part u-boot --source rawcopy --sourceparams="file=imx-boot-${MACHINE}-sd.bin" --ondisk mmcblk --no-table --align ${IMX_BOOT_SEEK}
-part /boot --source bootimg-partition --ondisk mmcblk --fstype=vfat --label boot --active --align 4096 --size 32
-part / --source rootfs --ondisk mmcblk --fstype=ext4 --label root --align 4096
-
-bootloader --ptable msdos
diff --git a/scripts/manifest.xml b/scripts/manifest.xml
index fba96b60..8f876733 100644
--- a/scripts/manifest.xml
+++ b/scripts/manifest.xml
@@ -12,7 +12,6 @@
   <remote fetch="ssh://git@git.qt.io/boot2qt" name="playground"/>
   <remote fetch="git://git.toradex.com" name="toradex"/>
   <remote fetch="git://github.com/boundarydevices" name="boundary"/>
-  <remote fetch="git://source.codeaurora.org/external/imx" name="aurora-imx"/>
 
   <project name="poky"
            remote="yocto"
@@ -33,14 +32,14 @@
 
   <project name="meta-freescale"
            remote="freescale"
-           revision="deb8750093fa8c44df0871131c82284fa4edc22f"
+           revision="b61675eccc5ac3cf73f9e24bc651a08ab37110de"
            path="sources/meta-freescale"
-           groups="notdefault,external,fsl,toradex,boundary,fsl-imx8,toradex-imx8"/>
+           groups="notdefault,external,freescale"/>
   <project name="meta-freescale-3rdparty"
            remote="freescale"
            revision="da422478d38e744283bcf61123c4a526396c7030"
            path="sources/meta-freescale-3rdparty"
-           groups="notdefault,external,fsl,toradex,boundary,fsl-imx8,toradex-imx8"/>
+           groups="notdefault,external,freescale"/>
   <project name="meta-raspberrypi"
            remote="yocto"
            revision="c2f2eaf4451691c24f17fd28b11d228e07e911dd"
@@ -71,9 +70,4 @@
            revision="d1a51cff1d295f60aa84be99adafb6fbab26e6d6"
            path="sources/meta-boundary"
            groups="notdefault,external,boundary"/>
-  <project name="meta-fsl-bsp-release"
-           remote="aurora-imx"
-           revision="cb65aa03c70d0b88cdc2b06eb56ab59ae01f54bf"
-           path="sources/meta-fsl-bsp-release"
-           groups="notdefault,external,fsl-imx8"/>
 </manifest>
diff --git a/scripts/setup-environment.sh b/scripts/setup-environment.sh
index f03b4f11..fbb2edb9 100755
--- a/scripts/setup-environment.sh
+++ b/scripts/setup-environment.sh
@@ -63,16 +63,13 @@ if [ ! -e ${PWD}/${BUILDDIRECTORY} ]; then
     LAYERSCONF=${BSPLAYER}/conf/bblayers.conf.sample
   else
     case ${MACHINE} in
-      imx8*)
-        LAYERSCONF="bblayers.conf.fsl-imx8.sample"
-        ;;
       apalis-*|colibri-*)
         LAYERSCONF="bblayers.conf.toradex.sample"
         ;;
       nitrogen6x|nitrogen7|nitrogen8m|nitrogen8mm)
         LAYERSCONF="bblayers.conf.boundary.sample"
         ;;
-      imx6qdlsabresd|imx7dsabresd|imx7s-warp)
+      imx*)
         LAYERSCONF="bblayers.conf.fsl.sample"
         ;;
       raspberrypi*)