Move extra layers to use BBFILES_DYNAMIC

Instead of having additional meta layers, include the bbappends dynamically whenever the corresponding layer is used. Change-Id: I30f62ada645d9bf0e2a4aee9ca4db4144a6ccb83 Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
author: Samuli Piippo <samuli.piippo@qt.io> 2019-08-29 15:53:47 +0300
committer: Samuli Piippo <samuli.piippo@qt.io> 2019-09-20 12:39:50 +0300
commit: 8b14714e95a2d82f9747c08be494a09ddf2f01be (patch)
tree: f7b8d64043abea230264d4892502896ca1757640 /meta-fsl-extras
parent: 61c40f565769b34f82c57aedf3f730f23b9f7c03 (diff)
58 files changed, 0 insertions, 2400 deletions
diff --git a/meta-fsl-extras/conf/layer.conf b/meta-fsl-extras/conf/layer.conf
deleted file mode 100644
index 5a76c9c1..00000000
--- a/meta-fsl-extras/conf/layer.conf
+++ /dev/null
@@ -1,49 +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$
-##
-############################################################################
-
-# We have a conf and classes directory, append to BBPATH
-BBPATH .= ":${LAYERDIR}"
-
-# We have a recipes directory, add to BBFILES
-BBFILES += "${LAYERDIR}/recipes*/*/*.bb \
-            ${LAYERDIR}/recipes*/*/*.bbappend \
-            "
-
-BBFILE_COLLECTIONS += "b2qt_fsl"
-BBFILE_PATTERN_b2qt_fsl := "^${LAYERDIR}/"
-BBFILE_PRIORITY_b2qt_fsl = "20"
-
-LAYERSERIES_COMPAT_b2qt_fsl = "warrior"
-
-# override meta-fsl-bsp-release layers COMPATs
-LAYERSERIES_COMPAT_fsl-bsp-release = "warrior"
-LAYERSERIES_COMPAT_fsl-sdk-release = "warrior"
-
-# override meta-boundary layer COMPATs
-LAYERSERIES_COMPAT_boundary-layer = "warrior"
diff --git a/meta-fsl-extras/recipes-bsp/broadcom-nvram-config/bcm4330-nvram-config.bbappend b/meta-fsl-extras/recipes-bsp/broadcom-nvram-config/bcm4330-nvram-config.bbappend
deleted file mode 100644
index 068b9fa9..00000000
--- a/meta-fsl-extras/recipes-bsp/broadcom-nvram-config/bcm4330-nvram-config.bbappend
+++ /dev/null
@@ -1,32 +0,0 @@
-############################################################################
-##
-## Copyright (C) 2016 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$
-##
-############################################################################
-
-FILESEXTRAPATHS_prepend := "${THISDIR}/${MACHINE}:"
-
-COMPATIBLE_MACHINE = "(cubox-i|nitrogen6x|nitrogen6x-lite|wandboard|imx6sl-warp)"
diff --git a/meta-fsl-extras/recipes-bsp/broadcom-nvram-config/nitrogen6x/brcmfmac4330-sdio.txt b/meta-fsl-extras/recipes-bsp/broadcom-nvram-config/nitrogen6x/brcmfmac4330-sdio.txt
deleted file mode 100644
index 6183cca2..00000000
--- a/meta-fsl-extras/recipes-bsp/broadcom-nvram-config/nitrogen6x/brcmfmac4330-sdio.txt
+++ /dev/null
@@ -1,80 +0,0 @@
-#
-# Board configuration for Boundary Devices Nitrogen6-Lite
-#
-manfid=0x2d0
-prodid=0x0547
-vendid=0x14e4
-devid=0x4360
-boardtype=0x05e1
-boardrev=0x1202
-boardflags=0x0080200
-nocrc=1
-xtalfreq=37400
-boardnum=22
-ag0=254
-aa2g=1
-ccode=ALL
-pa0itssit=0x20
-pa0b0=5367
-pa0b1=-633
-pa0b2=-158
-rssismf2g=0xa
-rssismc2g=0x3
-rssisav2g=0x7
-#rssi params for 5GHz
-rssismf5g=0x4
-rssismc5g=0x3
-rssisav5g=0x7
-#PA parameters for lower a-band
-pa1lob0=4378
-pa1lob1=-596
-pa1lob2=-180
-#PA parameters for midband
-pa1b0=4672
-pa1b1=-603
-pa1b2=-172
-#PA parameters for high band
-pa1hib0=4752
-pa1hib1=-609
-pa1hib2=-173
-rxpo5g=0
-maxp2ga0=76
-maxp5ga0=0x42
-maxp5gla0=0x42
-maxp5gha0=0x42
-# 2.4G Tx Power offsets
-cck2gpo=0x4444
-ofdm2gpo=0x66666666
-mcs2gpo0=0x8888
-mcs2gpo1=0x8888
-# 5G Tx Power offsets
-ofdm5gpo=0x44444444
-ofdm5glpo=0x44444444
-ofdm5ghpo=0x44444444
-mcs5gpo0=0x6666
-mcs5gpo1=0x6666
-mcs5glpo0=0x6666
-mcs5glpo1=0x6666
-mcs5ghpo0=0x6666
-mcs5ghpo1=0x46666
-sromrev=3
-# il0macaddr=00:90:4c:c5:12:38
-wl0id=0x431b
-cckPwrOffset=4
-swctrlmap_2g=0x44844484,0x42824282,0x40804484,0x18282,0x1ff
-triso5g=0
-swctrlmap_5g=0x00100010,0x20202020,0x20202020,0x14202,0x0f0
-rfreg033=0x19
-rfreg033_cck=0x1f
-dacrate2g=160
-dacrate5g=160
-txalpfbyp2g=1
-bphyscale=17
-cckPwrIdxCorr=-15
-pacalidx2g=50
-#pacalidx5g=20
-noise_cal_ref_2g=53
-noise_cal_po_2g=0
-noise_cal_ref_5g=52
-noise_cal_po_5g=5,0,0
-
diff --git a/meta-fsl-extras/recipes-bsp/firmware-imx/firmware-imx.inc b/meta-fsl-extras/recipes-bsp/firmware-imx/firmware-imx.inc
deleted file mode 100644
index 5407a5a1..00000000
--- a/meta-fsl-extras/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-fsl-extras/recipes-bsp/firmware-imx/firmware-imx_%.bbappend b/meta-fsl-extras/recipes-bsp/firmware-imx/firmware-imx_%.bbappend
deleted file mode 100644
index 9eb14b6d..00000000
--- a/meta-fsl-extras/recipes-bsp/firmware-imx/firmware-imx_%.bbappend
+++ /dev/null
@@ -1,31 +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$
-##
-############################################################################
-
-# need to use MACHINE_ARCH since the recipe deploys machine specific files
-PACKAGE_ARCH_mx8 = "${MACHINE_ARCH}"
diff --git a/meta-fsl-extras/recipes-bsp/imx-vpu/imx-vpu.inc b/meta-fsl-extras/recipes-bsp/imx-vpu/imx-vpu.inc
deleted file mode 100644
index 7b339565..00000000
--- a/meta-fsl-extras/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-fsl-extras/recipes-bsp/u-boot/u-boot-boundary/0001-Add-support-for-KOE-tx31d200vm0baa-display.patch b/meta-fsl-extras/recipes-bsp/u-boot/u-boot-boundary/0001-Add-support-for-KOE-tx31d200vm0baa-display.patch
deleted file mode 100644
index 9378f0a6..00000000
--- a/meta-fsl-extras/recipes-bsp/u-boot/u-boot-boundary/0001-Add-support-for-KOE-tx31d200vm0baa-display.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-From ea15ee300074cb1453dce6a068feec0771a28418 Mon Sep 17 00:00:00 2001
-From: Samuli Piippo <samuli.piippo@theqtcompany.com>
-Date: Thu, 11 Feb 2016 10:17:51 +0200
-Subject: [PATCH] Add support for KOE tx31d200vm0baa display
-
-Used for the cluster demo
----
- arch/arm/include/asm/mach-imx/fbpanel.h      | 27 ++++++++++++++++++++
- board/boundary/nitrogen6_max/nitrogen6_max.c |  3 ++-
- board/boundary/nitrogen6sx/nitrogen6sx.c     |  3 ++-
- board/boundary/nitrogen6x/nitrogen6x.c       |  3 ++-
- 4 files changed, 33 insertions(+), 3 deletions(-)
-
-diff --git a/arch/arm/include/asm/mach-imx/fbpanel.h b/arch/arm/include/asm/mach-imx/fbpanel.h
-index 4b924d2ac8..d4ef998faf 100644
---- a/arch/arm/include/asm/mach-imx/fbpanel.h
-+++ b/arch/arm/include/asm/mach-imx/fbpanel.h
-@@ -174,6 +174,33 @@ void fbp_setup_env_cmds(void);
- 	.fbtype = FB_##_mode,\
- 	.fbflags = _flags
- 
-+/* tx31d200vm0baa == koe */
-+#define IMX_VD_KOE(_mode, _detect, _bus) \
-+{\
-+	.bus	= _bus,\
-+	.addr	= 0,\
-+	.pixfmt	= IPU_PIX_FMT_RGB666,\
-+	.detect	= NULL,\
-+	.enable	= fbp_enable_fb,\
-+	.fbtype = FB_##_mode,\
-+	.fbflags = 0,\
-+	.mode	= {\
-+		.name           = "koe",\
-+		.refresh        = 60,\
-+		.xres           = 1280,\
-+		.yres           = 480,\
-+		.pixclock       = 1000000000000ULL/((1280+80+48+32)*(480+15+2+6)*60),\
-+		.left_margin    = 80,\
-+		.right_margin   = 48,\
-+		.upper_margin   = 15,\
-+		.lower_margin   = 2,\
-+		.hsync_len      = 32,\
-+		.vsync_len      = 6,\
-+		.sync           = FB_SYNC_EXT,\
-+		.vmode          = FB_VMODE_NONINTERLACED\
-+	}\
-+}
-+
- /* hdmi settings */
- #define VDF_1280_720M_60(_mode, _name, _fmt, _flags, _detect, _bus, _addr) \
- {\
-diff --git a/board/boundary/nitrogen6_max/nitrogen6_max.c b/board/boundary/nitrogen6_max/nitrogen6_max.c
-index 12e3af89d0..3be475efc0 100644
---- a/board/boundary/nitrogen6_max/nitrogen6_max.c
-+++ b/board/boundary/nitrogen6_max/nitrogen6_max.c
-@@ -499,7 +499,8 @@ int fbp_detect_serializer(struct display_info_t const *di)
- }
- 
- static const struct display_info_t displays[] = {
--	/* hdmi */
-+	IMX_VD_KOE(LVDS, 0, 2),
-+        /* hdmi */
- 	VD_1280_720M_60(HDMI, fbp_detect_i2c, 1, 0x50),
- 	VD_1920_1080M_60(HDMI, NULL, 1, 0x50),
- 	VD_1024_768M_60(HDMI, NULL, 1, 0x50),
-diff --git a/board/boundary/nitrogen6sx/nitrogen6sx.c b/board/boundary/nitrogen6sx/nitrogen6sx.c
-index 5581637424..5ded443c78 100644
---- a/board/boundary/nitrogen6sx/nitrogen6sx.c
-+++ b/board/boundary/nitrogen6sx/nitrogen6sx.c
-@@ -435,7 +435,8 @@ void board_enable_lcd(const struct display_info_t *di, int enable)
- }
- 
- static const struct display_info_t displays[] = {
--	/* hdmi/lcd via tfp410 */
-+	IMX_VD_KOE(LVDS, 0, 2),
-+        /* hdmi/lcd via tfp410 */
- 	VDF_1280_720M_60(LCD, "1280x720M@60", RGB24, 0, fbp_detect_i2c, 2, 0x50),
- 	VDF_1920_1080M_60(LCD, "1920x1080M@60", RGB24, 0, NULL, 2, 0x50),
- 	VDF_1024_768M_60(LCD, "1024x768M@60", RGB24, 0, NULL, 2, 0x50),
-diff --git a/board/boundary/nitrogen6x/nitrogen6x.c b/board/boundary/nitrogen6x/nitrogen6x.c
-index 8ee7f641bf..dbf1bd4a99 100644
---- a/board/boundary/nitrogen6x/nitrogen6x.c
-+++ b/board/boundary/nitrogen6x/nitrogen6x.c
-@@ -362,7 +362,8 @@ void board_pre_enable(const struct display_info_t *di)
- }
- 
- static const struct display_info_t displays[] = {
--	/* hdmi */
-+	IMX_VD_KOE(LVDS, 0, 2),
-+        /* hdmi */
- 	VD_1280_720M_60(HDMI, fbp_detect_i2c, 1, 0x50),
- 	VD_1920_1080M_60(HDMI, NULL, 1, 0x50),
- 	VD_1024_768M_60(HDMI, NULL, 1, 0x50),
diff --git a/meta-fsl-extras/recipes-bsp/u-boot/u-boot-boundary/0002-set-CMA-reserved-size-to-384MB.patch b/meta-fsl-extras/recipes-bsp/u-boot/u-boot-boundary/0002-set-CMA-reserved-size-to-384MB.patch
deleted file mode 100644
index d730e60a..00000000
--- a/meta-fsl-extras/recipes-bsp/u-boot/u-boot-boundary/0002-set-CMA-reserved-size-to-384MB.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From e21337ad1663e6fd6da4a5175ad72e629c62bab5 Mon Sep 17 00:00:00 2001
-From: Mikko Gronoff <mikko.gronoff@qt.io>
-Date: Sun, 23 Apr 2017 21:47:01 +0300
-Subject: [PATCH] set CMA reserved size to 384MB
-
-Increased from 256MB (the default) to 384MB. Without this, HW-accelerated
-video decoding cannot work for high resolution videos.
----
- include/configs/nitrogen6x.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h
-index 62708b839b..eb3b30b2ce 100644
---- a/include/configs/nitrogen6x.h
-+++ b/include/configs/nitrogen6x.h
-@@ -26,6 +26,7 @@
- #define CONFIG_USB_MAX_CONTROLLER_COUNT 2
- 
- #define BD_I2C_MASK	7
-+#define BD_CMA		"384M"
- 
- #if defined(CONFIG_SABRELITE)
- #include "boundary.h"
diff --git a/meta-fsl-extras/recipes-bsp/u-boot/u-boot-boundary_%.bbappend b/meta-fsl-extras/recipes-bsp/u-boot/u-boot-boundary_%.bbappend
deleted file mode 100644
index b3894d56..00000000
--- a/meta-fsl-extras/recipes-bsp/u-boot/u-boot-boundary_%.bbappend
+++ /dev/null
@@ -1,36 +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$
-##
-############################################################################
-
-FILESEXTRAPATHS_append := "${THISDIR}/${PN}:"
-SRC_URI += " \
-        file://0001-Add-support-for-KOE-tx31d200vm0baa-display.patch \
-        file://0002-set-CMA-reserved-size-to-384MB.patch \
-        "
-
-DEPENDS += "u-boot-mkimage-native"
diff --git a/meta-fsl-extras/recipes-bsp/u-boot/u-boot-fslc/0001-Updated-kernel-arguments-for-sabre-sd.patch b/meta-fsl-extras/recipes-bsp/u-boot/u-boot-fslc/0001-Updated-kernel-arguments-for-sabre-sd.patch
deleted file mode 100644
index fbf83da3..00000000
--- a/meta-fsl-extras/recipes-bsp/u-boot/u-boot-fslc/0001-Updated-kernel-arguments-for-sabre-sd.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-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
-
-- disable blanking and cursor blinking
----
- include/configs/mx6sabre_common.h | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h
-index 03d4f34904..50e84d144f 100644
---- a/include/configs/mx6sabre_common.h
-+++ b/include/configs/mx6sabre_common.h
-@@ -111,6 +111,8 @@
- 		"done\0" \
- 	"mmcargs=setenv bootargs console=${console},${baudrate} " \
- 		"root=PARTUUID=${uuid} rootwait rw " \
-+		"consoleblank=0 " \
-+		"vt.global_cursor_default=0 " \
- 		VIDEO_ARGS "\0" \
- 	"loadbootscript=" \
- 		"fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
diff --git a/meta-fsl-extras/recipes-bsp/u-boot/u-boot-fslc/0001-use-imx7d-warp.dtb.patch b/meta-fsl-extras/recipes-bsp/u-boot/u-boot-fslc/0001-use-imx7d-warp.dtb.patch
deleted file mode 100644
index 2c1c70d8..00000000
--- a/meta-fsl-extras/recipes-bsp/u-boot/u-boot-fslc/0001-use-imx7d-warp.dtb.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-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-bsp/u-boot/u-boot-fslc_%.bbappend b/meta-fsl-extras/recipes-bsp/u-boot/u-boot-fslc_%.bbappend
deleted file mode 100644
index 815244f6..00000000
--- a/meta-fsl-extras/recipes-bsp/u-boot/u-boot-fslc_%.bbappend
+++ /dev/null
@@ -1,34 +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$
-##
-############################################################################
-
-FILESEXTRAPATHS_append := "${THISDIR}/${PN}:"
-SRC_URI += " \
-        file://0001-Updated-kernel-arguments-for-sabre-sd.patch \
-        file://0001-use-imx7d-warp.dtb.patch \
-        "
diff --git a/meta-fsl-extras/recipes-bsp/u-boot/u-boot-script-boundary/0001-Set-screen-resolution-for-ft5x06_ts-based-on-selecte.patch b/meta-fsl-extras/recipes-bsp/u-boot/u-boot-script-boundary/0001-Set-screen-resolution-for-ft5x06_ts-based-on-selecte.patch
deleted file mode 100644
index 02a1e33a..00000000
--- a/meta-fsl-extras/recipes-bsp/u-boot/u-boot-script-boundary/0001-Set-screen-resolution-for-ft5x06_ts-based-on-selecte.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 3c3c3284727076f4ae751bfc9cadb222423c9a4b Mon Sep 17 00:00:00 2001
-From: Samuli Piippo <samuli.piippo@theqtcompany.com>
-Date: Wed, 13 Jan 2016 08:55:41 +0200
-Subject: [PATCH] Set screen resolution for ft5x06_ts based on selected display
-
----
- board/boundary/nitrogen6x/6x_bootscript-yocto-3.14.txt | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/board/boundary/nitrogen6x/6x_bootscript-yocto-3.14.txt b/board/boundary/nitrogen6x/6x_bootscript-yocto-3.14.txt
-index f6bf2f5..427d837 100644
---- a/board/boundary/nitrogen6x/6x_bootscript-yocto-3.14.txt
-+++ b/board/boundary/nitrogen6x/6x_bootscript-yocto-3.14.txt
-@@ -130,6 +130,12 @@ if itest.s "x" != "x${disable_msi}" ; then
- 	setenv bootargs ${bootargs} pci=nomsi
- fi;
- 
-+if test "hannstar" = "${fb_lvds}" || test "hannstar" = "${fb_lvds2}"  ; then
-+    setenv bootargs ${bootargs} ft5x06_ts.screenres=1024,600
-+elif test "hannstar7" = "${fb_lvds}" || test "hannstar7" = "${fb_lvds2}"  ; then
-+    setenv bootargs ${bootargs} ft5x06_ts.screenres=1280,800
-+fi
-+
- if itest.s "x" != "x${disable_giga}" ; then
- 	setenv bootargs ${bootargs} fec.disable_giga=1
- fi
diff --git a/meta-fsl-extras/recipes-bsp/u-boot/u-boot-script-boundary_%.bbappend b/meta-fsl-extras/recipes-bsp/u-boot/u-boot-script-boundary_%.bbappend
deleted file mode 100644
index e4b37308..00000000
--- a/meta-fsl-extras/recipes-bsp/u-boot/u-boot-script-boundary_%.bbappend
+++ /dev/null
@@ -1,33 +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$
-##
-############################################################################
-
-FILESEXTRAPATHS_append := "${THISDIR}/${PN}:"
-SRC_URI += " \
-        file://0001-Set-screen-resolution-for-ft5x06_ts-based-on-selecte.patch \
-        "
diff --git a/meta-fsl-extras/recipes-bsp/u-boot/u-boot-script-toradex.bb b/meta-fsl-extras/recipes-bsp/u-boot/u-boot-script-toradex.bb
deleted file mode 100644
index 464c1fb4..00000000
--- a/meta-fsl-extras/recipes-bsp/u-boot/u-boot-script-toradex.bb
+++ /dev/null
@@ -1,72 +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$
-##
-############################################################################
-
-LICENSE = "The-Qt-Company-Commercial"
-LIC_FILES_CHKSUM = "file://${BOOT2QTBASE}/licenses/The-Qt-Company-Commercial;md5=948f8877345cd66106f11031977a4625"
-DEPENDS = "u-boot-mkimage-native"
-
-PV = "2.8b3"
-
-SRC_URI = " \
-    file://fwd_mmc.scr \
-    file://fwd_blk.scr \
-    file://fwd_eth.scr \
-    file://flash_blk.scr \
-    file://flash_eth.scr \
-    file://0001-Update-only-u-boot.patch \
-    "
-
-S = "${WORKDIR}"
-
-inherit deploy
-
-do_mkimage () {
-    for scr in ${WORKDIR}/*.scr; do
-        uboot-mkimage -A arm -O linux -T script -C none -a 0 -e 0 \
-                  -n "update script" -d ${scr} \
-                  ${S}/$(basename ${scr} .scr).img
-    done
-}
-
-addtask mkimage after do_compile before do_install
-
-do_deploy () {
-    install -d ${DEPLOYDIR}/${MACHINE}
-    install -m 0644 -t ${DEPLOYDIR} ${S}/*.img
-    ln -fs ../flash_blk.img ${DEPLOYDIR}/${MACHINE}/
-    ln -fs ../flash_eth.img ${DEPLOYDIR}/${MACHINE}/
-}
-
-addtask deploy after do_install before do_build
-
-do_compile[noexec] = "1"
-do_install[noexec] = "1"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-COMPATIBLE_MACHINE = "(apalis-imx6|colibri-vf|colibri-imx6|colibri-imx7)"
diff --git a/meta-fsl-extras/recipes-bsp/u-boot/u-boot-script-toradex/colibri-imx6ull/0001-Update-only-u-boot.patch b/meta-fsl-extras/recipes-bsp/u-boot/u-boot-script-toradex/colibri-imx6ull/0001-Update-only-u-boot.patch
deleted file mode 100644
index 999828ea..00000000
--- a/meta-fsl-extras/recipes-bsp/u-boot/u-boot-script-toradex/colibri-imx6ull/0001-Update-only-u-boot.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From c563131a55ebf0f2956d5e6df400c45ae72cff38 Mon Sep 17 00:00:00 2001
-From: Samuli Piippo <samuli.piippo@qt.io>
-Date: Wed, 14 Sep 2016 10:19:28 +0300
-Subject: [PATCH] Update only u-boot
-
----
- flash_blk.scr | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/flash_blk.scr b/flash_blk.scr
-index b8b8a93..824b6dc 100644
---- a/flash_blk.scr
-+++ b/flash_blk.scr
-@@ -10,6 +10,6 @@ setenv update_kernel 'fatload ${interface} 0:1 ${fdt_addr_r} ${board_name}/zImag
- setenv update_fdt 'fatload ${interface} 0:1 ${fdt_addr_r} ${board_name}/imx6ull-colibri${variant}-${fdt_board}.dtb && ubi write ${fdt_addr_r} dtb ${filesize}'
- setenv update_rootfs 'fatload ${interface} 0:1 ${fdt_addr_r} ${board_name}/ubifs.img && ubi write ${fdt_addr_r} rootfs ${filesize}'
- 
--setenv update 'mtdparts default && run update_uboot && run prepare_ubi && run update_kernel && run update_fdt && run update_rootfs && reset'
-+setenv update 'mtdparts default && run update_uboot && reset'
- 
- echo 'enter "run update" to update the entire module'
diff --git a/meta-fsl-extras/recipes-bsp/u-boot/u-boot-script-toradex/colibri-imx6ull/flash_blk.scr b/meta-fsl-extras/recipes-bsp/u-boot/u-boot-script-toradex/colibri-imx6ull/flash_blk.scr
deleted file mode 100644
index b8b8a930..00000000
--- a/meta-fsl-extras/recipes-bsp/u-boot/u-boot-script-toradex/colibri-imx6ull/flash_blk.scr
+++ /dev/null
@@ -1,15 +0,0 @@
-setenv create_bcb 'nand erase.part mx6ull-bcb && writebcb 80000 200000'
-setenv recreate_bcb 'nand read ${fdt_addr_r} 0x800 0x800 && run create_bcb && nand write ${fdt_addr_r} 0x800 0x800'
-
-setenv prepare_kernel_fdt 'ubi create kernel 0x800000 static && ubi create dtb 0x20000 static'
-setenv prepare_rootfs 'ubi create rootfs 0 dynamic'
-setenv prepare_ubi 'ubi part ubi && if ubi check rootfs; then else run prepare_kernel_fdt && && run prepare_rootfs; fi'
-
-setenv update_uboot 'fatload ${interface} 0:1 ${fdt_addr_r} ${board_name}/u-boot-nand.imx && nand erase.part u-boot1 && nand write ${fdt_addr_r} u-boot1 ${filesize} && nand erase.part u-boot2 && nand write ${fdt_addr_r} u-boot2 ${filesize}'
-setenv update_kernel 'fatload ${interface} 0:1 ${fdt_addr_r} ${board_name}/zImage && ubi write ${fdt_addr_r} kernel ${filesize}'
-setenv update_fdt 'fatload ${interface} 0:1 ${fdt_addr_r} ${board_name}/imx6ull-colibri${variant}-${fdt_board}.dtb && ubi write ${fdt_addr_r} dtb ${filesize}'
-setenv update_rootfs 'fatload ${interface} 0:1 ${fdt_addr_r} ${board_name}/ubifs.img && ubi write ${fdt_addr_r} rootfs ${filesize}'
-
-setenv update 'mtdparts default && run update_uboot && run prepare_ubi && run update_kernel && run update_fdt && run update_rootfs && reset'
-
-echo 'enter "run update" to update the entire module'
diff --git a/meta-fsl-extras/recipes-bsp/u-boot/u-boot-script-toradex/colibri-imx6ull/flash_eth.scr b/meta-fsl-extras/recipes-bsp/u-boot/u-boot-script-toradex/colibri-imx6ull/flash_eth.scr
deleted file mode 100644
index c65c1d3d..00000000
--- a/meta-fsl-extras/recipes-bsp/u-boot/u-boot-script-toradex/colibri-imx6ull/flash_eth.scr
+++ /dev/null
@@ -1,15 +0,0 @@
-setenv create_bcb 'nand erase.part mx6ull-bcb && writebcb 80000 200000'
-setenv recreate_bcb 'nand read ${fdt_addr_r} 0x800 0x800 && run create_bcb && nand write ${fdt_addr_r} 0x800 0x800'
-
-setenv prepare_kernel_fdt 'ubi create kernel 0x800000 static && ubi create dtb 0x20000 static'
-setenv prepare_rootfs 'ubi create rootfs 0 dynamic'
-setenv prepare_ubi 'ubi part ubi && if ubi check rootfs; then else run prepare_kernel_fdt && && run prepare_rootfs; fi'
-
-setenv update_uboot 'tftpboot ${fdt_addr_r} ${board_name}/u-boot-nand.imx && nand erase.part u-boot1 && nand write ${fdt_addr_r} u-boot1 ${filesize} && nand erase.part u-boot2 && nand write ${fdt_addr_r} u-boot2 ${filesize}'
-setenv update_kernel 'tftpboot ${fdt_addr_r} ${board_name}/zImage && ubi write ${fdt_addr_r} kernel ${filesize}'
-setenv update_fdt 'tftpboot ${fdt_addr_r} ${board_name}/imx6ull-colibri${variant}-${fdt_board}.dtb && ubi write ${fdt_addr_r} dtb ${filesize}'
-setenv update_rootfs 'tftpboot ${fdt_addr_r} ${board_name}/ubifs.img && ubi write ${fdt_addr_r} rootfs ${filesize}'
-
-setenv update 'mtdparts default && run update_uboot && run prepare_ubi && run update_kernel && run update_fdt && run update_rootfs && reset'
-
-echo 'enter "run update" to update the entire module'
diff --git a/meta-fsl-extras/recipes-bsp/u-boot/u-boot-script-toradex/colibri-imx7-emmc/0001-Update-only-u-boot.patch b/meta-fsl-extras/recipes-bsp/u-boot/u-boot-script-toradex/colibri-imx7-emmc/0001-Update-only-u-boot.patch
deleted file mode 100644
index e69de29b..00000000
--- a/meta-fsl-extras/recipes-bsp/u-boot/u-boot-script-toradex/colibri-imx7-emmc/0001-Update-only-u-boot.patch
+++ /dev/null
diff --git a/meta-fsl-extras/recipes-bsp/u-boot/u-boot-script-toradex/colibri-imx7-emmc/flash_blk.scr b/meta-fsl-extras/recipes-bsp/u-boot/u-boot-script-toradex/colibri-imx7-emmc/flash_blk.scr
deleted file mode 100644
index 8524cef8..00000000
--- a/meta-fsl-extras/recipes-bsp/u-boot/u-boot-script-toradex/colibri-imx7-emmc/flash_blk.scr
+++ /dev/null
@@ -1,2 +0,0 @@
-echo 'Legacy update is not supported for this module type'
-
diff --git a/meta-fsl-extras/recipes-bsp/u-boot/u-boot-script-toradex/colibri-imx7-emmc/flash_eth.scr b/meta-fsl-extras/recipes-bsp/u-boot/u-boot-script-toradex/colibri-imx7-emmc/flash_eth.scr
deleted file mode 100644
index 8524cef8..00000000
--- a/meta-fsl-extras/recipes-bsp/u-boot/u-boot-script-toradex/colibri-imx7-emmc/flash_eth.scr
+++ /dev/null
@@ -1,2 +0,0 @@
-echo 'Legacy update is not supported for this module type'
-
diff --git a/meta-fsl-extras/recipes-bsp/u-boot/u-boot-script-toradex/colibri-imx7/0001-Update-only-u-boot.patch b/meta-fsl-extras/recipes-bsp/u-boot/u-boot-script-toradex/colibri-imx7/0001-Update-only-u-boot.patch
deleted file mode 100644
index 2235fae3..00000000
--- a/meta-fsl-extras/recipes-bsp/u-boot/u-boot-script-toradex/colibri-imx7/0001-Update-only-u-boot.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 7e05ac9e6dc984bd060d766740ff494e0e3519d7 Mon Sep 17 00:00:00 2001
-From: Samuli Piippo <samuli.piippo@qt.io>
-Date: Wed, 14 Sep 2016 10:19:28 +0300
-Subject: [PATCH] Update only u-boot
-
----
- flash_blk.scr | 2 +-
- flash_eth.scr | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/flash_blk.scr b/flash_blk.scr
-index 9fa6296..e599070 100644
---- a/flash_blk.scr
-+++ b/flash_blk.scr
-@@ -15,7 +15,7 @@ setenv update_fdt 'fatload ${interface} 0:1 ${fdt_addr_r} ${board_name}/${soc}-c
- setenv update_rootfs 'fatload ${interface} 0:1 ${fdt_addr_r} ${board_name}/ubifs.img && ubi write ${fdt_addr_r} rootfs ${filesize}'
- 
- # Test which version of U-Boot we are currently running on
--setenv update 'mtdparts default && env default -f updlevel && if test $updlevel -lt 1; then; run update_uboot_old; else; run update_uboot && run prepare_ubi && run update_kernel && run update_fdt && run update_rootfs && reset; fi'
-+setenv update 'mtdparts default && env default -f updlevel && if test $updlevel -lt 1; then; run update_uboot_old; else; run update_uboot; fi'
- 
- if itest.b *0x30360800 -lt 0x11; then
- echo &&
-diff --git a/flash_eth.scr b/flash_eth.scr
-index 20244d7..7f3372c 100644
---- a/flash_eth.scr
-+++ b/flash_eth.scr
-@@ -15,7 +15,7 @@ setenv update_fdt 'tftpboot ${fdt_addr_r} ${board_name}/${soc}-colibri-${fdt_boa
- setenv update_rootfs 'tftpboot ${fdt_addr_r} ${board_name}/ubifs.img && ubi write ${fdt_addr_r} rootfs ${filesize}'
- 
- # Test which version of U-Boot we are currently running on
--setenv update 'mtdparts default && env default -f updlevel && if test $updlevel -lt 1; then; run update_uboot_old; else; run update_uboot && run prepare_ubi && run update_kernel && run update_fdt && run update_rootfs && reset; fi'
-+setenv update 'mtdparts default && env default -f updlevel && if test $updlevel -lt 1; then; run update_uboot_old; else; run update_uboot && reset; fi'
- 
- if itest.b *0x30360800 -lt 0x11; then
- echo &&
diff --git a/meta-fsl-extras/recipes-bsp/u-boot/u-boot-script-toradex/colibri-imx7/flash_blk.scr b/meta-fsl-extras/recipes-bsp/u-boot/u-boot-script-toradex/colibri-imx7/flash_blk.scr
deleted file mode 100644
index 9fa6296c..00000000
--- a/meta-fsl-extras/recipes-bsp/u-boot/u-boot-script-toradex/colibri-imx7/flash_blk.scr
+++ /dev/null
@@ -1,29 +0,0 @@
-setenv create_bcb 'nand erase.part mx7-bcb && writebcb 80000 200000'
-setenv recreate_bcb 'nand read ${fdt_addr_r} 0x800 0x800 && run create_bcb && nand write ${fdt_addr_r} 0x800 0x800'
-
-# Migrate to UBI volume based boot schema
-setenv prepare_kernel_fdt 'ubi create kernel 0x800000 static && ubi create dtb 0x20000 static'
-setenv prepare_m4firmware 'ubi create m4firmware 0xe0000 static'
-setenv prepare_rootfs 'ubi create rootfs 0 dynamic'
-setenv prepare_ubi 'ubi part ubi && if ubi check rootfs; then if ubi check kernel; then else ubi remove rootfs && run prepare_kernel_fdt && run prepare_m4firmware && run prepare_rootfs; fi; else run prepare_kernel_fdt && run prepare_m4firmware && run prepare_rootfs; fi'
-
-setenv upgrade_msg 'echo && echo "Upgraded U-Boot, please reset the board and complete update with" && echo "# run setupdate && run recreate_bcb && run update" && echo && echo "(note the recreate_bcb command in between!)"'
-setenv update_uboot_old 'fatload ${interface} 0:1 ${fdt_addr_r} ${board_name}/u-boot-nand.imx && nand erase.part u-boot && nand erase.part u-boot-env && writeboot ${fdt_addr_r} 80000 200000 $filesize && nand erase.part u-boot-env && nand erase.part ubi && run upgrade_msg'
-setenv update_uboot 'fatload ${interface} 0:1 ${fdt_addr_r} ${board_name}/u-boot-nand.imx && nand erase.part u-boot1 && nand write ${fdt_addr_r} u-boot1 ${filesize} && nand erase.part u-boot2 && nand write ${fdt_addr_r} u-boot2 ${filesize}'
-setenv update_kernel 'fatload ${interface} 0:1 ${fdt_addr_r} ${board_name}/zImage && ubi write ${fdt_addr_r} kernel ${filesize}'
-setenv update_fdt 'fatload ${interface} 0:1 ${fdt_addr_r} ${board_name}/${soc}-colibri-${fdt_board}.dtb && ubi write ${fdt_addr_r} dtb ${filesize}'
-setenv update_rootfs 'fatload ${interface} 0:1 ${fdt_addr_r} ${board_name}/ubifs.img && ubi write ${fdt_addr_r} rootfs ${filesize}'
-
-# Test which version of U-Boot we are currently running on
-setenv update 'mtdparts default && env default -f updlevel && if test $updlevel -lt 1; then; run update_uboot_old; else; run update_uboot && run prepare_ubi && run update_kernel && run update_fdt && run update_rootfs && reset; fi'
-
-if itest.b *0x30360800 -lt 0x11; then
-echo &&
-echo 'NOTE: The U-Boot provided with this BSP version does not support the' &&
-echo 'early tapeout/stepping of i.MX 7 used on your module. You still can' &&
-echo 'update the kernel/device-tree/rootfs manually using: ' &&
-echo '# run prepare_ubi && run update_kernel && run update_fdt && run update_rootfs' &&
-echo && setenv update_uboot; setenv update_uboot_old; setenv update
-else
-echo 'enter "run update" to update the entire module'
-fi
diff --git a/meta-fsl-extras/recipes-bsp/u-boot/u-boot-script-toradex/colibri-imx7/flash_eth.scr b/meta-fsl-extras/recipes-bsp/u-boot/u-boot-script-toradex/colibri-imx7/flash_eth.scr
deleted file mode 100644
index 20244d71..00000000
--- a/meta-fsl-extras/recipes-bsp/u-boot/u-boot-script-toradex/colibri-imx7/flash_eth.scr
+++ /dev/null
@@ -1,29 +0,0 @@
-setenv create_bcb 'nand erase.part mx7-bcb && writebcb 80000 200000'
-setenv recreate_bcb 'nand read ${fdt_addr_r} 0x800 0x800 && run create_bcb && nand write ${fdt_addr_r} 0x800 0x800'
-
-# Migrate to UBI volume based boot schema
-setenv prepare_kernel_fdt 'ubi create kernel 0x800000 static && ubi create dtb 0x20000 static'
-setenv prepare_m4firmware 'ubi create m4firmware 0xe0000 static'
-setenv prepare_rootfs 'ubi create rootfs 0 dynamic'
-setenv prepare_ubi 'ubi part ubi && if ubi check rootfs; then if ubi check kernel; then else ubi remove rootfs && run prepare_kernel_fdt && run prepare_m4firmware && run prepare_rootfs; fi; else run prepare_kernel_fdt && run prepare_m4firmware && run prepare_rootfs; fi'
-
-setenv upgrade_msg 'echo && echo "Upgraded U-Boot, please reset the board and complete update with" && echo "# run setupdate && run recreate_bcb && run update" && echo && echo "(note the recreate_bcb command in between!)"'
-setenv update_uboot_old 'tftpboot ${fdt_addr_r} ${board_name}/u-boot-nand.imx && nand erase.part u-boot && nand erase.part u-boot-env && writeboot ${fdt_addr_r} 80000 200000 $filesize && nand erase.part u-boot-env && nand erase.part ubi && run upgrade_msg'
-setenv update_uboot 'tftpboot ${fdt_addr_r} ${board_name}/u-boot-nand.imx && nand erase.part u-boot1 && nand write ${fdt_addr_r} u-boot1 ${filesize} && nand erase.part u-boot2 && nand write ${fdt_addr_r} u-boot2 ${filesize}'
-setenv update_kernel 'tftpboot ${fdt_addr_r} ${board_name}/zImage && ubi write ${fdt_addr_r} kernel ${filesize}'
-setenv update_fdt 'tftpboot ${fdt_addr_r} ${board_name}/${soc}-colibri-${fdt_board}.dtb && ubi write ${fdt_addr_r} dtb ${filesize}'
-setenv update_rootfs 'tftpboot ${fdt_addr_r} ${board_name}/ubifs.img && ubi write ${fdt_addr_r} rootfs ${filesize}'
-
-# Test which version of U-Boot we are currently running on
-setenv update 'mtdparts default && env default -f updlevel && if test $updlevel -lt 1; then; run update_uboot_old; else; run update_uboot && run prepare_ubi && run update_kernel && run update_fdt && run update_rootfs && reset; fi'
-
-if itest.b *0x30360800 -lt 0x11; then
-echo &&
-echo 'NOTE: The U-Boot provided with this BSP version does not support the' &&
-echo 'early tapeout/stepping of i.MX 7 used on your module. You still can' &&
-echo 'update the kernel/device-tree/rootfs manually using: ' &&
-echo '# run prepare_ubi && run update_kernel && run update_fdt && run update_rootfs' &&
-echo && setenv update_uboot; setenv update_uboot_old; setenv update
-else
-echo 'enter "run update" to update the entire module'
-fi
diff --git a/meta-fsl-extras/recipes-bsp/u-boot/u-boot-script-toradex/colibri-vf/0001-Update-only-u-boot.patch b/meta-fsl-extras/recipes-bsp/u-boot/u-boot-script-toradex/colibri-vf/0001-Update-only-u-boot.patch
deleted file mode 100644
index 2aa8421a..00000000
--- a/meta-fsl-extras/recipes-bsp/u-boot/u-boot-script-toradex/colibri-vf/0001-Update-only-u-boot.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 7d0fc874871d79125b1c17b32fec9742b2f5839e Mon Sep 17 00:00:00 2001
-From: Samuli Piippo <samuli.piippo@qt.io>
-Date: Wed, 14 Sep 2016 10:22:27 +0300
-Subject: [PATCH] Update only u-boot
-
----
- flash_blk.scr | 4 ++--
- flash_eth.scr | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/flash_blk.scr b/flash_blk.scr
-index ae0fd5c..1b34c75 100644
---- a/flash_blk.scr
-+++ b/flash_blk.scr
-@@ -11,7 +11,7 @@ setenv update_kernel 'fatload ${interface} 0:1 ${fdt_addr_r} ${board_name}/zImag
- setenv update_fdt 'fatload ${interface} 0:1 ${fdt_addr_r} ${board_name}/${soc}-colibri-${fdt_board}.dtb && ubi write ${fdt_addr_r} dtb ${filesize}'
- setenv update_rootfs 'fatload ${interface} 0:1 ${fdt_addr_r} ${board_name}/ubifs.img && ubi write ${fdt_addr_r} rootfs ${filesize}'
- 
--setenv update_new 'run update_uboot; run prepare_ubi && run update_kernel && run update_fdt && run update_rootfs; reset'
-+setenv update_new 'run update_uboot; reset'
- 
- # Upgrade part 1, write new U-Boot, but with old ECC format still...
- # Store config block temporarly in memory at kernel_addr_r.
-@@ -19,7 +19,7 @@ setenv upgrade_part1 'run update_uboot && nand read ${kernel_addr_r} 0x800 0x20
- setenv upgrade_part1_msg 'Successfully updated U-Boot, NAND upgrade required. Enter "reset", interrupt boot process and enter "run setupdate; run upgrade_part2" to complete upgrade.'
- 
- # Upgrade part 2, use new ECC format for the whole device...
--setenv upgrade_part2 'run create_bcb && nand write ${kernel_addr_r} 0x800 0x20 && run update_uboot && nand erase.part ubi && run update_rootfs && echo ${upgrade_part2_msg}'
-+setenv upgrade_part2 'run create_bcb && nand write ${kernel_addr_r} 0x800 0x20 && run update_uboot && echo ${upgrade_part2_msg}'
- setenv upgrade_part2_msg 'Successfully upgraded module, enter "reset" to restart the module.'
- 
- # fsl_nfc indicates old NAND format (24-bit ECC), start migration process
-diff --git a/flash_eth.scr b/flash_eth.scr
-index b0e4904..0a8e3cc 100644
---- a/flash_eth.scr
-+++ b/flash_eth.scr
-@@ -11,7 +11,7 @@ setenv update_kernel 'tftpboot ${fdt_addr_r} ${board_name}/zImage && ubi write $
- setenv update_fdt 'tftpboot ${fdt_addr_r} ${board_name}/${soc}-colibri-${fdt_board}.dtb && ubi write ${fdt_addr_r} dtb ${filesize}'
- setenv update_rootfs 'tftpboot ${fdt_addr_r} ${board_name}/ubifs.img && ubi write ${fdt_addr_r} rootfs ${filesize}'
- 
--setenv update_new 'run update_uboot; run prepare_ubi && run update_kernel && run update_fdt && run update_rootfs; reset'
-+setenv update_new 'run update_uboot; reset'
- 
- # Upgrade part 1, write new U-Boot, but with old ECC format still...
- # Store config block temporarly in memory at kernel_addr_r.
-@@ -19,7 +19,7 @@ setenv upgrade_part1 'run update_uboot && nand read ${kernel_addr_r} 0x800 0x20
- setenv upgrade_part1_msg 'Successfully updated U-Boot, NAND upgrade required. Enter "reset", interrupt boot process and enter "run setupdate; run upgrade_part2" to complete upgrade.'
- 
- # Upgrade part 2, use new ECC format for the whole device...
--setenv upgrade_part2 'run create_bcb && nand write ${kernel_addr_r} 0x800 0x20 && run update_uboot && nand erase.part ubi && run update_rootfs && echo ${upgrade_part2_msg}'
-+setenv upgrade_part2 'run create_bcb && nand write ${kernel_addr_r} 0x800 0x20 && run update_uboot && echo ${upgrade_part2_msg}'
- setenv upgrade_part2_msg 'Successfully upgraded module, enter "reset" to restart the module.'
- 
- # fsl_nfc indicates old NAND format (24-bit ECC), start migration process
diff --git a/meta-fsl-extras/recipes-bsp/u-boot/u-boot-script-toradex/colibri-vf/flash_blk.scr b/meta-fsl-extras/recipes-bsp/u-boot/u-boot-script-toradex/colibri-vf/flash_blk.scr
deleted file mode 100644
index ae0fd5c1..00000000
--- a/meta-fsl-extras/recipes-bsp/u-boot/u-boot-script-toradex/colibri-vf/flash_blk.scr
+++ /dev/null
@@ -1,28 +0,0 @@
-setenv create_bcb 'nand erase.part vf-bcb && writebcb 0x20000 0x20000'
-setenv update_configblock 'fatload ${interface} 0:1 ${fdt_addr_r} ${board_name}/configblock.bin && nand write ${fdt_addr_r} 0x800 ${filesize}'
-
-# Migrate to UBI volume based boot schema
-setenv prepare_kernel_fdt 'ubi create kernel 0x800000 static && ubi create dtb 0x20000 static'
-setenv prepare_rootfs 'ubi create rootfs 0 dynamic'
-setenv prepare_ubi 'ubi part ubi && if ubi check rootfs; then if ubi check kernel; then else ubi remove rootfs && run prepare_kernel_fdt && run prepare_rootfs; fi; else run prepare_kernel_fdt && run prepare_rootfs; fi'
-
-setenv update_uboot 'fatload ${interface} 0:1 ${fdt_addr_r} ${board_name}/u-boot-nand.imx && nand erase.part u-boot && nand erase.part u-boot-env && nand write ${fdt_addr_r} u-boot'
-setenv update_kernel 'fatload ${interface} 0:1 ${fdt_addr_r} ${board_name}/zImage && ubi write ${fdt_addr_r} kernel ${filesize}'
-setenv update_fdt 'fatload ${interface} 0:1 ${fdt_addr_r} ${board_name}/${soc}-colibri-${fdt_board}.dtb && ubi write ${fdt_addr_r} dtb ${filesize}'
-setenv update_rootfs 'fatload ${interface} 0:1 ${fdt_addr_r} ${board_name}/ubifs.img && ubi write ${fdt_addr_r} rootfs ${filesize}'
-
-setenv update_new 'run update_uboot; run prepare_ubi && run update_kernel && run update_fdt && run update_rootfs; reset'
-
-# Upgrade part 1, write new U-Boot, but with old ECC format still...
-# Store config block temporarly in memory at kernel_addr_r.
-setenv upgrade_part1 'run update_uboot && nand read ${kernel_addr_r} 0x800 0x20 && echo "${upgrade_part1_msg}"'
-setenv upgrade_part1_msg 'Successfully updated U-Boot, NAND upgrade required. Enter "reset", interrupt boot process and enter "run setupdate; run upgrade_part2" to complete upgrade.'
-
-# Upgrade part 2, use new ECC format for the whole device...
-setenv upgrade_part2 'run create_bcb && nand write ${kernel_addr_r} 0x800 0x20 && run update_uboot && nand erase.part ubi && run update_rootfs && echo ${upgrade_part2_msg}'
-setenv upgrade_part2_msg 'Successfully upgraded module, enter "reset" to restart the module.'
-
-# fsl_nfc indicates old NAND format (24-bit ECC), start migration process
-setenv update 'mtdparts default && if test "${mtdids}" = "nand0=fsl_nfc"; then; run upgrade_part1; else run update_new; fi'
-
-echo 'enter "run update" to update the entire module'
diff --git a/meta-fsl-extras/recipes-bsp/u-boot/u-boot-script-toradex/colibri-vf/flash_eth.scr b/meta-fsl-extras/recipes-bsp/u-boot/u-boot-script-toradex/colibri-vf/flash_eth.scr
deleted file mode 100644
index b0e4904e..00000000
--- a/meta-fsl-extras/recipes-bsp/u-boot/u-boot-script-toradex/colibri-vf/flash_eth.scr
+++ /dev/null
@@ -1,28 +0,0 @@
-setenv create_bcb 'nand erase.part vf-bcb && writebcb 0x20000 0x20000'
-setenv update_configblock 'tftpboot ${fdt_addr_r} ${board_name}/configblock.bin && nand write ${fdt_addr_r} 0x800 ${filesize}'
-
-# Migrate to UBI volume based boot schema
-setenv prepare_kernel_fdt 'ubi create kernel 0x800000 static && ubi create dtb 0x20000 static'
-setenv prepare_rootfs 'ubi create rootfs 0 dynamic'
-setenv prepare_ubi 'ubi part ubi && if ubi check rootfs; then if ubi check kernel; then else ubi remove rootfs && run prepare_kernel_fdt && run prepare_rootfs; fi; else run prepare_kernel_fdt && run prepare_rootfs; fi'
-
-setenv update_uboot 'tftpboot ${fdt_addr_r} ${board_name}/u-boot-nand.imx && nand erase.part u-boot && nand erase.part u-boot-env && nand write ${fdt_addr_r} u-boot'
-setenv update_kernel 'tftpboot ${fdt_addr_r} ${board_name}/zImage && ubi write ${fdt_addr_r} kernel ${filesize}'
-setenv update_fdt 'tftpboot ${fdt_addr_r} ${board_name}/${soc}-colibri-${fdt_board}.dtb && ubi write ${fdt_addr_r} dtb ${filesize}'
-setenv update_rootfs 'tftpboot ${fdt_addr_r} ${board_name}/ubifs.img && ubi write ${fdt_addr_r} rootfs ${filesize}'
-
-setenv update_new 'run update_uboot; run prepare_ubi && run update_kernel && run update_fdt && run update_rootfs; reset'
-
-# Upgrade part 1, write new U-Boot, but with old ECC format still...
-# Store config block temporarly in memory at kernel_addr_r.
-setenv upgrade_part1 'run update_uboot && nand read ${kernel_addr_r} 0x800 0x20 && echo "${upgrade_part1_msg}"'
-setenv upgrade_part1_msg 'Successfully updated U-Boot, NAND upgrade required. Enter "reset", interrupt boot process and enter "run setupdate; run upgrade_part2" to complete upgrade.'
-
-# Upgrade part 2, use new ECC format for the whole device...
-setenv upgrade_part2 'run create_bcb && nand write ${kernel_addr_r} 0x800 0x20 && run update_uboot && nand erase.part ubi && run update_rootfs && echo ${upgrade_part2_msg}'
-setenv upgrade_part2_msg 'Successfully upgraded module, enter "reset" to restart the module.'
-
-# fsl_nfc indicates old NAND format (24-bit ECC), start migration process
-setenv update 'mtdparts default && if test "${mtdids}" = "nand0=fsl_nfc"; then; run upgrade_part1; else run update_new; fi'
-
-echo 'enter "run update" to update the entire module'
diff --git a/meta-fsl-extras/recipes-bsp/u-boot/u-boot-script-toradex/fwd_blk.scr b/meta-fsl-extras/recipes-bsp/u-boot/u-boot-script-toradex/fwd_blk.scr
deleted file mode 100644
index 7af72e6d..00000000
--- a/meta-fsl-extras/recipes-bsp/u-boot/u-boot-script-toradex/fwd_blk.scr
+++ /dev/null
@@ -1,11 +0,0 @@
-#the update.sh script renames this. fwd_blk.scr -> ../flash_blk.img
-test -n ${interface} || setenv interface mmc
-test -n ${drive} || setenv drive 1
-test -z "${board_name}" && test "${soc}" = "vf500" && setenv board_name colibri_vf
-test -z "${board_name}" && test "${soc}" = "vf610" && setenv board_name colibri_vf
-test "${board_name}" = "colibri_imx7" && setenv drive 0
-test "${board_name}" = "colibri_t20" && setenv drive 0
-test "${board_name}" = "colibri_vf" && setenv drive 0
-
-test -n ${board_name} || echo "board_name env not set!" && exit
-fatload ${interface} ${drive}:1 ${loadaddr} ${board_name}/flash_blk.img && source ${loadaddr}
diff --git a/meta-fsl-extras/recipes-bsp/u-boot/u-boot-script-toradex/fwd_eth.scr b/meta-fsl-extras/recipes-bsp/u-boot/u-boot-script-toradex/fwd_eth.scr
deleted file mode 100644
index d7ea35c2..00000000
--- a/meta-fsl-extras/recipes-bsp/u-boot/u-boot-script-toradex/fwd_eth.scr
+++ /dev/null
@@ -1,6 +0,0 @@
-#the update.sh script renames this. fwd_eth.scr -> ../flash_eth.img
-test -z "${board_name}" && test "${soc}" = "vf500" && setenv board_name colibri_vf
-test -z "${board_name}" && test "${soc}" = "vf610" && setenv board_name colibri_vf
-
-test -n ${board_name} || echo "board_name env not set!" && exit
-tftpboot ${loadaddr} "${board_name}/flash_eth.img" && source ${loadaddr}
diff --git a/meta-fsl-extras/recipes-bsp/u-boot/u-boot-script-toradex/fwd_mmc.scr b/meta-fsl-extras/recipes-bsp/u-boot/u-boot-script-toradex/fwd_mmc.scr
deleted file mode 100644
index 4c8f666f..00000000
--- a/meta-fsl-extras/recipes-bsp/u-boot/u-boot-script-toradex/fwd_mmc.scr
+++ /dev/null
@@ -1,3 +0,0 @@
-#the update.sh script renames this. fwd_mmc.scr -> ../flash_mmc.img
-#flash_mmc has been renamed to flash_blk, ensure compatibilty when updating from older versions
-fatload mmc ${drive}:1 ${loadaddr} flash_blk.img && source ${loadaddr}
diff --git a/meta-fsl-extras/recipes-bsp/u-boot/u-boot-script-toradex/mx6/0001-Update-only-u-boot.patch b/meta-fsl-extras/recipes-bsp/u-boot/u-boot-script-toradex/mx6/0001-Update-only-u-boot.patch
deleted file mode 100644
index 91aa2bc5..00000000
--- a/meta-fsl-extras/recipes-bsp/u-boot/u-boot-script-toradex/mx6/0001-Update-only-u-boot.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 735a68d1e110edead4b858499c8d97be3e90d0f8 Mon Sep 17 00:00:00 2001
-From: Samuli Piippo <samuli.piippo@qt.io>
-Date: Mon, 15 May 2017 14:04:38 +0300
-Subject: [PATCH] Update only u-boot
-
----
- flash_blk.scr | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/flash_blk.scr b/flash_blk.scr
-index 5c75100..5c8486d 100644
---- a/flash_blk.scr
-+++ b/flash_blk.scr
-@@ -38,7 +38,7 @@ setenv update_v2.5b3 'run check_configblock || run migrate_configblock; run migr
- 
- # Not migrated to SPL if no U-Boot Image Magic Number at 69k into the eMMC
- setenv update_to_spl 'mmc dev 0 1; mmc read $fdt_addr_r 8a 1; itest.l *12000000 -ne 56190527 && run update_spl'
--setenv update_latest 'run update_to_spl; run update_uboot; run update_1; run update_2; run update_kernel; run update_fdt; run update_3'
-+setenv update_latest 'run update_to_spl; run update_uboot'
- # 'updt_fuse' not available in V2.5 Beta 3 and earlier, migration needed
- setenv update_new 'updt_fuse -n && run update_latest && reset; run update_v2.5b3'
- # 'mmc bootbus' not available in in V2.4 Beta 1 and earlier, migration needed
diff --git a/meta-fsl-extras/recipes-bsp/u-boot/u-boot-script-toradex/mx6/flash_blk.scr b/meta-fsl-extras/recipes-bsp/u-boot/u-boot-script-toradex/mx6/flash_blk.scr
deleted file mode 100644
index 12d89cf4..00000000
--- a/meta-fsl-extras/recipes-bsp/u-boot/u-boot-script-toradex/mx6/flash_blk.scr
+++ /dev/null
@@ -1,47 +0,0 @@
-test -n ${interface} || setenv interface mmc
-test -n ${drive} || setenv drive 1
-setenv uboot_hwpart 1
-
-setenv set_blkcnt 'setexpr blkcnt ${filesize} + 0x1ff && setexpr blkcnt ${blkcnt} / 0x200'
-#workaround U-Boot counting in hex and split did in decimal
-setenv incr_decimal 'setexpr filenum ${filenum} + 1; setexpr filenrlow1 ${filenum} % 0x100; setexpr filenrlow2 ${filenrlow1} % 0x10; test ${filenrlow1} -eq "9a" && test ${filenrlow2} -ne "9" && setexpr filenum ${filenum} + 0x66; test ${filenrlow1} -ne "9a" && test ${filenrlow2} -eq "a" && setexpr filenum ${filenum} + 0x6; true'
-setenv set_nextnum 'run incr_decimal; setexpr blkstart ${blkstart} + ${blkcnt}'
-
-setenv check_configblock 'setexpr toradex_oui_addr ${fdt_addr_r} + 8; mw.l ${kernel_addr_r} 0x002d1400; mmc dev 0 1; for off in 7ff fff 1fff 3fff 7fff ffff 1ffff; do mmc read ${fdt_addr_r} ${off} 1 && setenv conf_blk_offset $off; done; cmp.b ${kernel_addr_r} ${toradex_oui_addr} 3'
-
-setenv migrate_configblock 'run check_configblock; mmc dev 0 0 && mmc read ${fdt_addr_r} 0x500 1 && cmp.b ${kernel_addr_r} ${toradex_oui_addr} 3 && mmc dev 0 1 && mmc write ${fdt_addr_r} ${conf_blk_offset} 1'
-
-setenv migrate_uboot_old 'setenv uboot_hwpart 0; run update_spl && run update_uboot_bin; setenv uboot_hwpart 1'
-setenv migrate_uboot 'run update_spl && run update_uboot_bin && mmc bootbus 0 2 1 2 && mmc partconf 0 1 1 0'
-
-setenv cp_file_chunk 'load ${interface} ${drive}:1 ${fdt_addr_r} ${board_name}/root.ext4-${filenum} || setenv filesize 0; run set_blkcnt; mmc dev 0 0 && mmc write ${fdt_addr_r} ${blkstart} ${blkcnt}'
-
-setenv update_spl 'load ${interface} ${drive}:1 ${fdt_addr_r} ${board_name}/SPL && run set_blkcnt && mmc dev 0 ${uboot_hwpart} && mmc write ${fdt_addr_r} 2 ${blkcnt}'
-setenv update_uboot_bin 'load ${interface} ${drive}:1 ${fdt_addr_r} ${board_name}/u-boot.img && run set_blkcnt && mmc dev 0 ${uboot_hwpart} && mmc write ${fdt_addr_r} 8a ${blkcnt}'
-setenv update_uboot 'run update_uboot_bin && updt_fuse && mmc bootbus 0 2 0 1 && mmc partconf 0 1 1 0 && mmc rst-function 0 1'
-
-setenv update_kernel 'load ${interface} ${drive}:1 ${fdt_addr_r} ${board_name}/zImage && fatwrite mmc 0:1 ${fdt_addr_r} zImage ${filesize}'
-
-setenv update_fdt 'load ${interface} ${drive}:1 ${fdt_addr_r} ${board_name}/${fdt_file} && fatwrite mmc 0:1 ${fdt_addr_r} ${fdt_file} ${filesize}'
-
-setenv update_configblock 'run check_configblock; load ${interface} ${drive}:1 ${fdt_addr_r} ${board_name}/configblock.bin && mmc dev 0 1 && mmc write ${fdt_addr_r} ${conf_blk_offset} 1'
-
-setenv update_1 'load ${interface} ${drive}:1 ${fdt_addr_r} ${board_name}/mbr.bin && mmc dev 0 0 && mmc write ${fdt_addr_r} 0x0 0x1'
-setenv update_2 'load ${interface} ${drive}:1 ${fdt_addr_r} ${board_name}/boot.vfat && run set_blkcnt && mmc dev 0 0 && mmc write ${fdt_addr_r} 0x2000 ${blkcnt}'
-#do it in chunks of 64M to fit into DDR RAM of the smallest module
-setenv update_3 'setenv filesize 4000000; setenv filenum 100; setenv blkstart a000; while test ${filesize} -eq "4000000"; do run cp_file_chunk; run set_nextnum; done; true'
-
-setenv echo_migrate echo "successfully updated U-Boot, power-cycle and enter \"run setupdate\; run migrate\" to complete update"
-setenv migrate 'run migrate_configblock; run update_latest; reset'
-setenv update_v2.4b1 'run check_configblock || run migrate_configblock; run migrate_uboot_old && run echo_migrate'
-setenv update_v2.5b3 'run check_configblock || run migrate_configblock; run migrate_uboot && run echo_migrate'
-
-# Not migrated to SPL if no U-Boot Image Magic Number at 69k into the eMMC
-setenv update_to_spl 'mmc dev 0 1; mmc read $fdt_addr_r 8a 1; itest.l *12000000 -ne 56190527 && run update_spl'
-setenv update_latest 'run update_to_spl; run update_uboot; run update_1; run update_2; run update_kernel; run update_fdt; run update_3'
-# 'updt_fuse' not available in V2.5 Beta 3 and earlier, migration needed
-setenv update_new 'updt_fuse -n && run update_latest && reset; run update_v2.5b3'
-# 'mmc bootbus' not available in in V2.4 Beta 1 and earlier, migration needed
-setenv update 'mmc bootbus 0 2 0 1 && run update_new && exit; run update_v2.4b1'
-
-echo 'enter "run update" to update the entire module'
diff --git a/meta-fsl-extras/recipes-bsp/u-boot/u-boot-script-toradex/mx6/flash_eth.scr b/meta-fsl-extras/recipes-bsp/u-boot/u-boot-script-toradex/mx6/flash_eth.scr
deleted file mode 100644
index ee915232..00000000
--- a/meta-fsl-extras/recipes-bsp/u-boot/u-boot-script-toradex/mx6/flash_eth.scr
+++ /dev/null
@@ -1,45 +0,0 @@
-setenv uboot_hwpart 1
-
-setenv set_blkcnt 'setexpr blkcnt ${filesize} + 0x1ff && setexpr blkcnt ${blkcnt} / 0x200'
-#workaround U-Boot counting in hex and split did in decimal
-setenv incr_decimal 'setexpr filenum ${filenum} + 1; setexpr filenrlow1 ${filenum} % 0x100; setexpr filenrlow2 ${filenrlow1} % 0x10; test ${filenrlow1} -eq "9a" && test ${filenrlow2} -ne "9" && setexpr filenum ${filenum} + 0x66; test ${filenrlow1} -ne "9a" && test ${filenrlow2} -eq "a" && setexpr filenum ${filenum} + 0x6; true'
-setenv set_nextnum 'run incr_decimal; setexpr blkstart ${blkstart} + ${blkcnt}'
-
-setenv check_configblock 'setexpr toradex_oui_addr ${fdt_addr_r} + 8; mw.l ${kernel_addr_r} 0x002d1400; mmc dev 0 1; for off in 7ff fff 1fff 3fff 7fff ffff 1ffff; do mmc read ${fdt_addr_r} ${off} 1 && setenv conf_blk_offset $off; done; cmp.b ${kernel_addr_r} ${toradex_oui_addr} 3'
-
-setenv migrate_configblock 'run check_configblock; mmc dev 0 0 && mmc read ${fdt_addr_r} 0x500 1 && cmp.b ${kernel_addr_r} ${toradex_oui_addr} 3 && mmc dev 0 1 && mmc write ${fdt_addr_r} ${conf_blk_offset} 1'
-
-setenv migrate_uboot_old 'setenv uboot_hwpart 0; run update_spl && run update_uboot_bin; setenv uboot_hwpart 1'
-setenv migrate_uboot 'run update_spl && run update_uboot_bin && mmc bootbus 0 2 1 2 && mmc partconf 0 1 1 0'
-
-setenv cp_file_chunk 'tftpboot ${fdt_addr_r} ${board_name}/root.ext4-${filenum} || setenv filesize 0; run set_blkcnt; mmc dev 0 0 && mmc write ${fdt_addr_r} ${blkstart} ${blkcnt}'
-
-setenv update_spl 'tftpboot ${fdt_addr_r} ${board_name}/SPL && run set_blkcnt && mmc dev 0 ${uboot_hwpart} && mmc write ${fdt_addr_r} 2 ${blkcnt}'
-setenv update_uboot_bin 'tftpboot ${fdt_addr_r} ${board_name}/u-boot.img && run set_blkcnt && mmc dev 0 ${uboot_hwpart} && mmc write ${fdt_addr_r} 8a ${blkcnt}'
-setenv update_uboot 'run update_uboot_bin && updt_fuse && mmc bootbus 0 2 0 1 && mmc partconf 0 1 1 0 && mmc rst-function 0 1'
-
-setenv update_kernel 'tftpboot ${fdt_addr_r} ${board_name}/zImage && fatwrite mmc 0:1 ${fdt_addr_r} zImage ${filesize}'
-
-setenv update_fdt 'tftpboot ${fdt_addr_r} ${board_name}/${fdt_file} && fatwrite mmc 0:1 ${fdt_addr_r} ${fdt_file} ${filesize}'
-
-setenv update_configblock 'run check_configblock; tftpboot ${fdt_addr_r} ${board_name}/configblock.bin && mmc dev 0 1 && mmc write ${fdt_addr_r} ${conf_blk_offset} 1'
-
-setenv update_1 'tftpboot ${fdt_addr_r} ${board_name}/mbr.bin && mmc dev 0 0 && mmc write ${fdt_addr_r} 0x0 0x1'
-setenv update_2 'tftpboot ${fdt_addr_r} ${board_name}/boot.vfat && run set_blkcnt && mmc dev 0 0 && mmc write ${fdt_addr_r} 0x2000 ${blkcnt}'
-#do it in chunks of 64M to fit into DDR RAM of the smallest module
-setenv update_3 'setenv filesize 4000000; setenv filenum 100; setenv blkstart a000; while test ${filesize} -eq "4000000"; do run cp_file_chunk; run set_nextnum; done; true'
-
-setenv echo_migrate echo "successfully updated U-Boot, power-cycle and enter \"run setupdate\; run migrate\" to complete update"
-setenv migrate 'run migrate_configblock; run update_latest; reset'
-setenv update_v2.4b1 'run check_configblock || run migrate_configblock; run migrate_uboot_old && run echo_migrate'
-setenv update_v2.5b3 'run check_configblock || run migrate_configblock; run migrate_uboot && run echo_migrate'
-
-# Not migrated to SPL if no U-Boot Image Magic Number at 69k into the eMMC
-setenv update_to_spl 'mmc dev 0 1; mmc read $fdt_addr_r 8a 1; itest.l *12000000 -ne 56190527 && run update_spl'
-setenv update_latest 'run update_to_spl; run update_uboot; run update_1; run update_2; run update_kernel; run update_fdt; run update_3'
-# 'updt_fuse' not available in V2.5 Beta 3 and earlier, migration needed
-setenv update_new 'updt_fuse -n && run update_latest && reset; run update_v2.5b3'
-# 'mmc bootbus' not available in in V2.4 Beta 1 and earlier, migration needed
-setenv update 'mmc bootbus 0 2 0 1 && run update_new && exit; run update_v2.4b1'
-
-echo 'enter "run update" to update the entire module'
diff --git a/meta-fsl-extras/recipes-bsp/u-boot/u-boot-toradex/0001-Make-sdboot-default-on-all-boards.patch b/meta-fsl-extras/recipes-bsp/u-boot/u-boot-toradex/0001-Make-sdboot-default-on-all-boards.patch
deleted file mode 100644
index df1429b0..00000000
--- a/meta-fsl-extras/recipes-bsp/u-boot/u-boot-toradex/0001-Make-sdboot-default-on-all-boards.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From 74ffd57e80fd3f4e2d2d0b60e42a3b570aeb9c97 Mon Sep 17 00:00:00 2001
-From: Samuli Piippo <samuli.piippo@qt.io>
-Date: Mon, 15 May 2017 15:31:36 +0300
-Subject: [PATCH] Make sdboot default on all boards
-
-... and remove console=tty1 from kernel args
----
- include/configs/apalis_imx6.h  | 5 +++--
- include/configs/colibri_imx6.h | 5 +++--
- include/configs/colibri_imx7.h | 2 +-
- include/configs/colibri_vf.h   | 2 +-
- 4 files changed, 8 insertions(+), 6 deletions(-)
-
-diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h
-index fa40c629c3..ad0284de8a 100644
---- a/include/configs/apalis_imx6.h
-+++ b/include/configs/apalis_imx6.h
-@@ -177,8 +177,9 @@
- #ifdef CONFIG_TDX_EASY_INSTALLER
- #define CONFIG_BOOTCOMMAND "run distro_bootcmd"
- #else
--#define CONFIG_BOOTCOMMAND "run emmcboot; echo; echo emmcboot failed; " \
--		"run distro_bootcmd; usb start; " \
-+#define CONFIG_BOOTCOMMAND "run sdboot; echo; echo sdboot failed; " \
-+		"run emmcboot; echo; echo emmcboot failed; " \
-+                "run distro_bootcmd; usb start; " \
- 		"setenv stdout serial,vga; setenv stdin serial,usbkbd"
- #endif
- 
-diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h
-index fda171bd9e..df49efc9ef 100644
---- a/include/configs/colibri_imx6.h
-+++ b/include/configs/colibri_imx6.h
-@@ -157,8 +157,9 @@
- #ifdef CONFIG_TDX_EASY_INSTALLER
- #define CONFIG_BOOTCOMMAND "run distro_bootcmd"
- #else
--#define CONFIG_BOOTCOMMAND "run emmcboot; echo; echo emmcboot failed; " \
--		"run distro_bootcmd; usb start; " \
-+#define CONFIG_BOOTCOMMAND "run sdboot; echo; echo sdboot failed; " \
-+                "run emmcboot ; echo ; echo emmcboot failed ; " \
-+                "run distro_bootcmd; usb start; " \
- 		"setenv stdout serial,vga; setenv stdin serial,usbkbd"
- #endif
- 
-diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h
-index 6c91951878..4200512fea 100644
---- a/include/configs/colibri_imx7.h
-+++ b/include/configs/colibri_imx7.h
-@@ -128,7 +128,7 @@
- #define CONFIG_BOOTCOMMAND "setenv fdtfile ${soc}-colibri-${fdt_board}.dtb && " \
- 	"run bootcmd_mmc0; run ubiboot; run distro_bootcmd"
- #else
--#define CONFIG_BOOTCOMMAND "run ubiboot; " \
-+#define CONFIG_BOOTCOMMAND "run sdboot; run ubiboot; " \
- 	"setenv fdtfile ${soc}-colibri-${fdt_board}.dtb && run distro_bootcmd"
- #endif
- 
-diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h
-index 0579bfdc4e..65a5dada5f 100644
---- a/include/configs/colibri_vf.h
-+++ b/include/configs/colibri_vf.h
-@@ -155,7 +155,7 @@
- 		"ubi read ${fdt_addr_r} dtb && " \
- 		"run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \
- 
--#define CONFIG_BOOTCOMMAND "run ubiboot; " \
-+#define CONFIG_BOOTCOMMAND "run sdboot; run ubiboot; " \
- 	"setenv fdtfile ${soc}-colibri-${fdt_board}.dtb && run distro_bootcmd;"
- 
- #define BOOTENV_RUN_NET_USB_START ""
diff --git a/meta-fsl-extras/recipes-bsp/u-boot/u-boot-toradex/0002-apalis-imx6-test-for-Capacitive-Touch-Display-7-Para.patch b/meta-fsl-extras/recipes-bsp/u-boot/u-boot-toradex/0002-apalis-imx6-test-for-Capacitive-Touch-Display-7-Para.patch
deleted file mode 100644
index 080a8b59..00000000
--- a/meta-fsl-extras/recipes-bsp/u-boot/u-boot-toradex/0002-apalis-imx6-test-for-Capacitive-Touch-Display-7-Para.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 22ded9f935249b8a3980e1a392b2598128f071d6 Mon Sep 17 00:00:00 2001
-From: Samuli Piippo <samuli.piippo@qt.io>
-Date: Fri, 19 May 2017 12:41:38 +0300
-Subject: [PATCH] apalis-imx6: test for Capacitive Touch Display 7" Parallel
-
-Test i2c bus if Capacitive Touch Display 7" Parallel display is present
-during boot. If found, enable it as the primary display in kernel args.
-
-Set imx6q-apalis-ixora-v1.1.dtb as the default dtb, as it provides
-support for the atmel_mxt_ts touch controller.
----
- include/configs/apalis_imx6.h | 9 +++++++--
- 1 file changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h
-index 8dcb5cc5e4..59e74d41c0 100644
---- a/include/configs/apalis_imx6.h
-+++ b/include/configs/apalis_imx6.h
-@@ -249,7 +249,7 @@
- 		"${fdt_file} && setenv dtbparam \" - ${fdt_addr_r}\" && true\0"
- 
- #ifndef CONFIG_TDX_APALIS_IMX6_V1_0
--#define FDT_FILE "imx6q-apalis-eval.dtb"
-+#define FDT_FILE "imx6q-apalis-ixora-v1.1.dtb"
- #define FDT_FILE_V1_0 "imx6q-apalis_v1_0-eval.dtb"
- #else
- #define FDT_FILE "imx6q-apalis_v1_0-eval.dtb"
-@@ -279,9 +279,14 @@
- 		"|| setenv drive 2; mmc rescan; load ${interface} ${drive}:1" \
- 		" ${loadaddr} flash_blk.img && " \
- 		"source ${loadaddr}\0" \
--	"setup=setenv setupargs fec_mac=${ethaddr} " \
-+	"setup=run setupvideo; setenv setupargs fec_mac=${ethaddr} " \
- 		"consoleblank=0 no_console_suspend=1 console=tty1 " \
- 		"console=${console},${baudrate}n8\0" \
-+	"setupvideo=i2c dev 0; if i2c probe 4A; " \
-+		"then setenv vidargs mxc_hdmi.only_cea=1 " \
-+		"video=mxcfb0:dev=lcd,FusionF07A,if=RGB24 " \
-+		"video=mxcfb1:off video=mxcfb2:off video=mxcfb3:off " \
-+		"fbmem=32M; fi\0" \
- 	"setupdate=run setsdupdate || run setusbupdate || run setethupdate\0" \
- 	"setusbupdate=usb start && setenv interface usb; setenv drive 0; " \
- 		"load ${interface} ${drive}:1 ${loadaddr} flash_blk.img && " \
diff --git a/meta-fsl-extras/recipes-bsp/u-boot/u-boot-toradex/0003-apalis-imx6-Ixora-v1.0-support.patch b/meta-fsl-extras/recipes-bsp/u-boot/u-boot-toradex/0003-apalis-imx6-Ixora-v1.0-support.patch
deleted file mode 100644
index 8d28abe6..00000000
--- a/meta-fsl-extras/recipes-bsp/u-boot/u-boot-toradex/0003-apalis-imx6-Ixora-v1.0-support.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 166dae45bcfcd92cd2802db785a30072f65c0900 Mon Sep 17 00:00:00 2001
-From: Samuli Piippo <samuli.piippo@qt.io>
-Date: Thu, 12 Oct 2017 11:02:54 +0300
-Subject: [PATCH] apalis-imx6: Ixora v1.0 support
-
-Add sddrive variable that can be changed to boot from different mmc card
-slot when using different versions of ixora carrier board.
-Default to drive 1, which is correct for Ixora v1.1.
----
- include/configs/apalis_imx6.h | 10 ++++++----
- 1 file changed, 6 insertions(+), 4 deletions(-)
-
-diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h
-index 3f224e54b8..9e1b5a0f75 100644
---- a/include/configs/apalis_imx6.h
-+++ b/include/configs/apalis_imx6.h
-@@ -238,12 +238,14 @@
- 		"&& setenv dtbparam \" - ${fdt_addr_r}\" && true\0"
- 
- #define SD_BOOTCMD \
--	"sdargs=ip=off root=/dev/mmcblk1p2 ro rootfstype=ext4 rootwait\0" \
--	"sdboot=run setup; setenv bootargs ${defargs} ${sdargs} ${setupargs} " \
-+        "sddrive=1\0" \
-+        "sdsetup=setenv sdargs ip=off root=/dev/mmcblk${sddrive}p2 ro rootfstype=ext4 rootwait\0" \
-+        "sdboot=run setup; run sdsetup; " \
-+                "setenv bootargs ${defargs} ${sdargs} ${setupargs} " \
- 		"${vidargs}; echo Booting from MMC/SD card in 8-bit slot...; " \
--		"run sddtbload; load mmc 1:1 ${kernel_addr_r} ${boot_file} " \
-+		"run sddtbload; load mmc ${sddrive}:1 ${kernel_addr_r} ${boot_file} " \
- 		"&& run fdt_fixup && bootz ${kernel_addr_r} ${dtbparam}\0" \
--	"sddtbload=setenv dtbparam; load mmc 1:1 ${fdt_addr_r} " \
-+	"sddtbload=setenv dtbparam; load mmc ${sddrive}:1 ${fdt_addr_r} " \
- 		"${fdt_file} && setenv dtbparam \" - ${fdt_addr_r}\" && true\0"
- 
- #define USB_BOOTCMD \
diff --git a/meta-fsl-extras/recipes-bsp/u-boot/u-boot-toradex/0004-apalis-imx6-lower-default-resolution-on-HDMI-to-720p.patch b/meta-fsl-extras/recipes-bsp/u-boot/u-boot-toradex/0004-apalis-imx6-lower-default-resolution-on-HDMI-to-720p.patch
deleted file mode 100644
index acc5a164..00000000
--- a/meta-fsl-extras/recipes-bsp/u-boot/u-boot-toradex/0004-apalis-imx6-lower-default-resolution-on-HDMI-to-720p.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 6c83b14450862c63ebd755fdf81afde43cddfe6c Mon Sep 17 00:00:00 2001
-From: Samuli Piippo <samuli.piippo@qt.io>
-Date: Wed, 18 Oct 2017 13:20:25 +0300
-Subject: [PATCH] apalis-imx6: lower default resolution on HDMI to 720p
-
----
- include/configs/apalis_imx6.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h
-index 7aabb1334b..da34817a7a 100644
---- a/include/configs/apalis_imx6.h
-+++ b/include/configs/apalis_imx6.h
-@@ -294,7 +294,7 @@
- 		"source ${loadaddr}\0" \
- 	"splashpos=m,m\0" \
- 	"vidargs=mxc_hdmi.only_cea=1 " \
--		"video=mxcfb0:dev=hdmi,1920x1080M@60,if=RGB24 " \
-+		"video=mxcfb0:dev=hdmi,1280x720M@60,if=RGB24 " \
- 		"video=mxcfb1:off video=mxcfb2:off video=mxcfb3:off " \
- 		"fbmem=32M\0"
- 
diff --git a/meta-fsl-extras/recipes-bsp/u-boot/u-boot-toradex_%.bbappend b/meta-fsl-extras/recipes-bsp/u-boot/u-boot-toradex_%.bbappend
deleted file mode 100644
index 55a4c2bc..00000000
--- a/meta-fsl-extras/recipes-bsp/u-boot/u-boot-toradex_%.bbappend
+++ /dev/null
@@ -1,36 +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$
-##
-############################################################################
-
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-SRC_URI += " \
-        file://0001-Make-sdboot-default-on-all-boards.patch \
-        file://0002-apalis-imx6-test-for-Capacitive-Touch-Display-7-Para.patch \
-        file://0003-apalis-imx6-Ixora-v1.0-support.patch \
-        file://0004-apalis-imx6-lower-default-resolution-on-HDMI-to-720p.patch \
-        "
diff --git a/meta-fsl-extras/recipes-graphics/imx-dpu-g2d/imx-dpu-g2d_%.bbappend b/meta-fsl-extras/recipes-graphics/imx-dpu-g2d/imx-dpu-g2d_%.bbappend
deleted file mode 100644
index 4a998742..00000000
--- a/meta-fsl-extras/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-fsl-extras/recipes-graphics/libsdl2/libsdl2_%.bbappend b/meta-fsl-extras/recipes-graphics/libsdl2/libsdl2_%.bbappend
deleted file mode 100644
index 4d6a52be..00000000
--- a/meta-fsl-extras/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-fsl-extras/recipes-kernel/linux-firmware/linux-firmware_git.bbappend b/meta-fsl-extras/recipes-kernel/linux-firmware/linux-firmware_git.bbappend
deleted file mode 100644
index 932a4ec9..00000000
--- a/meta-fsl-extras/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-fsl-extras/recipes-kernel/linux/linux-boundary/0001-Add-support-for-koe-tx31d200vm0baa-display.patch b/meta-fsl-extras/recipes-kernel/linux/linux-boundary/0001-Add-support-for-koe-tx31d200vm0baa-display.patch
deleted file mode 100644
index 05de5cf9..00000000
--- a/meta-fsl-extras/recipes-kernel/linux/linux-boundary/0001-Add-support-for-koe-tx31d200vm0baa-display.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From d1f999566c5f346104d78568b51e96dec42b60c7 Mon Sep 17 00:00:00 2001
-From: Samuli Piippo <samuli.piippo@theqtcompany.com>
-Date: Wed, 27 Jan 2016 13:07:39 +0200
-Subject: [PATCH] Add support for koe tx31d200vm0baa display
-
----
- arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi | 12 ++++++++++++
- 1 file changed, 12 insertions(+)
-
-diff --git a/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi b/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi
-index 7b4c3d9bb8e6..9be478d89745 100644
---- a/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi
-+++ b/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi
-@@ -493,6 +493,7 @@
- 		pwm_lvds = &pwm4;
- 		rtc1 = &snvs_rtc;
- 		t_lvds = &t_lvds;
-+		koe = &koe;
- 	};
- 
- 	backlight_lcd: backlight-lcd {
-@@ -1058,6 +1059,17 @@
- 				hsync-len = <32>;
- 				vsync-len = <6>;
- 			};
-+			koe: tx31d200vm0baa {
-+				clock-frequency = <28000000>;
-+				hactive = <1280>;
-+				vactive = <480>;
-+				hback-porch = <200>;
-+				hfront-porch = <120>;
-+				vback-porch = <30>;
-+				vfront-porch = <20>;
-+				hsync-len = <0>;
-+				vsync-len = <0>;
-+			};
- 		};
- 	};
- };
diff --git a/meta-fsl-extras/recipes-kernel/linux/linux-boundary_4.%.bbappend b/meta-fsl-extras/recipes-kernel/linux/linux-boundary_4.%.bbappend
deleted file mode 100644
index ff0a0d28..00000000
--- a/meta-fsl-extras/recipes-kernel/linux/linux-boundary_4.%.bbappend
+++ /dev/null
@@ -1,40 +0,0 @@
-############################################################################
-##
-## Copyright (C) 2016 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$
-##
-############################################################################
-
-FILESEXTRAPATHS_append := "${THISDIR}/${PN}:"
-SRC_URI += " \
-        file://0001-Add-support-for-koe-tx31d200vm0baa-display.patch \
-        "
-
-# kernel image files are not needed in the image
-RDEPENDS_${KERNEL_PACKAGE_NAME}-base = ""
-
-do_preconfigure_prepend() {
-    echo "CONFIG_UPROBE_EVENT=y"                >> ${WORKDIR}/defconfig
-}
diff --git a/meta-fsl-extras/recipes-kernel/linux/linux-fslc-imx_4.%.bbappend b/meta-fsl-extras/recipes-kernel/linux/linux-fslc-imx_4.%.bbappend
deleted file mode 100644
index a6685754..00000000
--- a/meta-fsl-extras/recipes-kernel/linux/linux-fslc-imx_4.%.bbappend
+++ /dev/null
@@ -1,44 +0,0 @@
-############################################################################
-##
-## Copyright (C) 2016 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$
-##
-############################################################################
-
-# kernel image files are not needed in the image
-RDEPENDS_${KERNEL_PACKAGE_NAME}-base = ""
-
-do_preconfigure_prepend() {
-    # FunctionFS for qdbd
-    echo "CONFIG_USB_FUNCTIONFS=m"  >> ${WORKDIR}/defconfig
-
-    # Enable USB serial support
-    echo "CONFIG_USB_SERIAL_PL2303=m"       >> ${WORKDIR}/defconfig
-
-    echo "CONFIG_NAMESPACES=y"              >> ${WORKDIR}/defconfig
-
-    # Enable uprobe for profiling
-    echo "CONFIG_UPROBE_EVENT=y"            >> ${WORKDIR}/defconfig
-}
diff --git a/meta-fsl-extras/recipes-kernel/linux/linux-imx_4.%.bbappend b/meta-fsl-extras/recipes-kernel/linux/linux-imx_4.%.bbappend
deleted file mode 100644
index 9b4cc9b9..00000000
--- a/meta-fsl-extras/recipes-kernel/linux/linux-imx_4.%.bbappend
+++ /dev/null
@@ -1,45 +0,0 @@
-############################################################################
-##
-## Copyright (C) 2016 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$
-##
-############################################################################
-
-# 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
-
-    # Enable USB serial support
-    echo "CONFIG_USB_SERIAL_PL2303=m"       >> ${WORKDIR}/defconfig
-
-    echo "CONFIG_NAMESPACES=y"              >> ${WORKDIR}/defconfig
-    echo "CONFIG_FHANDLE=y"                 >> ${WORKDIR}/defconfig
-}
diff --git a/meta-fsl-extras/recipes-kernel/linux/linux-toradex_4.%.bbappend b/meta-fsl-extras/recipes-kernel/linux/linux-toradex_4.%.bbappend
deleted file mode 100644
index 8760ee8a..00000000
--- a/meta-fsl-extras/recipes-kernel/linux/linux-toradex_4.%.bbappend
+++ /dev/null
@@ -1,45 +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$
-##
-############################################################################
-
-RDEPENDS_${KERNEL_PACKAGE_NAME}-base = "${KERNEL_PACKAGE_NAME}-image ${KERNEL_PACKAGE_NAME}-devicetree"
-
-# 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
-
-    # disable all console messages from framebuffers
-    echo "CONFIG_FRAMEBUFFER_CONSOLE=n" >> ${WORKDIR}/defconfig
-
-    # Enable uprobe for profiling
-    echo "CONFIG_UPROBE_EVENT=y" >> ${WORKDIR}/defconfig
-    echo "CONFIG_FTRACE=y"       >> ${WORKDIR}/defconfig
-}
diff --git a/meta-fsl-extras/recipes-kernel/linux/linux-warp7/0001-ARM-fix-put_user-for-gcc-8.patch b/meta-fsl-extras/recipes-kernel/linux/linux-warp7/0001-ARM-fix-put_user-for-gcc-8.patch
deleted file mode 100644
index bf090724..00000000
--- a/meta-fsl-extras/recipes-kernel/linux/linux-warp7/0001-ARM-fix-put_user-for-gcc-8.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From fc95914167c03d682fbab51d54c5473b9fc97f5e Mon Sep 17 00:00:00 2001
-From: Arnd Bergmann <arnd@arndb.de>
-Date: Thu, 26 Jul 2018 10:13:23 +0200
-Subject: [PATCH] ARM: fix put_user() for gcc-8
-
-Building kernels before linux-4.7 with gcc-8 results in many build failures
-when gcc triggers a check that was meant to catch broken compilers:
-
-/tmp/ccCGMQmS.s:648: Error: .err encountered
-
-According to the discussion in the gcc bugzilla, a local "register
-asm()" variable is still supposed to be the correct way to force an
-inline assembly to use a particular register, but marking it 'const'
-lets the compiler do optimizations that break that, i.e the compiler is
-free to treat the variable as either 'const' or 'register' in that case.
-
-Upstream commit 9f73bd8bb445 ("ARM: uaccess: remove put_user() code
-duplication") fixed this problem in linux-4.8 as part of a larger change,
-but seems a little too big to be backported to 4.4.
-
-Let's take the simplest fix and change only the one broken line in the
-same way as newer kernels.
-
-Suggested-by: Bernd Edlinger <bernd.edlinger@hotmail.de>
-Link: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=85745
-Link: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=86673
-Signed-off-by: Arnd Bergmann <arnd@arndb.de>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- arch/arm/include/asm/uaccess.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/arch/arm/include/asm/uaccess.h b/arch/arm/include/asm/uaccess.h
-index 74b17d09ef7a..ee093236af9d 100644
---- a/arch/arm/include/asm/uaccess.h
-+++ b/arch/arm/include/asm/uaccess.h
-@@ -220,7 +220,7 @@ extern int __put_user_8(void *, unsigned long long);
- 	({								\
- 		unsigned long __limit = current_thread_info()->addr_limit - 1; \
- 		const typeof(*(p)) __user *__tmp_p = (p);		\
--		register const typeof(*(p)) __r2 asm("r2") = (x);	\
-+		register typeof(*(p)) __r2 asm("r2") = (x);	\
- 		register const typeof(*(p)) __user *__p asm("r0") = __tmp_p; \
- 		register unsigned long __l asm("r1") = __limit;		\
- 		register int __e asm("r0");				\
diff --git a/meta-fsl-extras/recipes-kernel/linux/linux-warp7/0001-Fix-dev-hwrng-by-enabling-warp7-crypto-device.patch b/meta-fsl-extras/recipes-kernel/linux/linux-warp7/0001-Fix-dev-hwrng-by-enabling-warp7-crypto-device.patch
deleted file mode 100644
index dbb7995c..00000000
--- a/meta-fsl-extras/recipes-kernel/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-kernel/linux/linux-warp7/defconfig b/meta-fsl-extras/recipes-kernel/linux/linux-warp7/defconfig
deleted file mode 100644
index 267fa977..00000000
--- a/meta-fsl-extras/recipes-kernel/linux/linux-warp7/defconfig
+++ /dev/null
@@ -1,444 +0,0 @@
-CONFIG_KERNEL_LZO=y
-CONFIG_SYSVIPC=y
-CONFIG_FHANDLE=y
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
-CONFIG_IKCONFIG=y
-CONFIG_IKCONFIG_PROC=y
-CONFIG_LOG_BUF_SHIFT=18
-CONFIG_CGROUPS=y
-CONFIG_RELAY=y
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_EXPERT=y
-CONFIG_KALLSYMS_ALL=y
-CONFIG_PERF_EVENTS=y
-# CONFIG_SLUB_DEBUG is not set
-# CONFIG_COMPAT_BRK is not set
-CONFIG_MODULES=y
-CONFIG_MODULE_UNLOAD=y
-CONFIG_MODVERSIONS=y
-CONFIG_MODULE_SRCVERSION_ALL=y
-# CONFIG_BLK_DEV_BSG is not set
-CONFIG_ARCH_MXC=y
-CONFIG_SOC_IMX50=y
-CONFIG_SOC_IMX53=y
-CONFIG_SOC_IMX6Q=y
-CONFIG_SOC_IMX6SL=y
-CONFIG_SOC_IMX6SX=y
-CONFIG_SOC_IMX6UL=y
-CONFIG_SOC_IMX7D=y
-CONFIG_SOC_VF610=y
-# CONFIG_SWP_EMULATE is not set
-CONFIG_SMP=y
-CONFIG_HAVE_ARM_ARCH_TIMER=y
-CONFIG_VMSPLIT_2G=y
-CONFIG_PREEMPT=y
-CONFIG_AEABI=y
-CONFIG_HIGHMEM=y
-CONFIG_CMA=y
-CONFIG_CMDLINE="noinitrd console=ttymxc0,115200"
-CONFIG_CPU_FREQ=y
-CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
-CONFIG_CPU_FREQ_GOV_POWERSAVE=y
-CONFIG_CPU_FREQ_GOV_USERSPACE=y
-CONFIG_CPU_FREQ_GOV_INTERACTIVE=y
-CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
-CONFIG_ARM_IMX6Q_CPUFREQ=y
-CONFIG_ARM_IMX7D_CPUFREQ=y
-CONFIG_CPU_IDLE=y
-CONFIG_VFP=y
-CONFIG_NEON=y
-CONFIG_BINFMT_MISC=m
-CONFIG_PM_DEBUG=y
-CONFIG_PM_TEST_SUSPEND=y
-CONFIG_NET=y
-CONFIG_PACKET=y
-CONFIG_UNIX=y
-CONFIG_INET=y
-CONFIG_IP_PNP=y
-CONFIG_IP_PNP_DHCP=y
-# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
-# CONFIG_INET_XFRM_MODE_TUNNEL is not set
-# CONFIG_INET_XFRM_MODE_BEET is not set
-# CONFIG_INET_LRO is not set
-CONFIG_IPV6=y
-CONFIG_VLAN_8021Q=y
-CONFIG_LLC2=y
-CONFIG_CAN=y
-CONFIG_CAN_FLEXCAN=y
-CONFIG_CAN_M_CAN=y
-CONFIG_BT=y
-CONFIG_BT_RFCOMM=y
-CONFIG_BT_RFCOMM_TTY=y
-CONFIG_BT_BNEP=y
-CONFIG_BT_BNEP_MC_FILTER=y
-CONFIG_BT_BNEP_PROTO_FILTER=y
-CONFIG_BT_HIDP=y
-# CONFIG_BT_HCIBTUSB is not set
-CONFIG_BT_HCIUART=y
-CONFIG_BT_HCIUART_H4=y
-# CONFIG_BT_HCIUART_BCSP is not set
-# CONFIG_BT_HCIUART_ATH3K is not set
-CONFIG_BT_HCIBCM203X=y
-# CONFIG_BT_ATH3K is not set
-CONFIG_CFG80211=y
-CONFIG_MAC80211=y
-CONFIG_DEVTMPFS=y
-CONFIG_DEVTMPFS_MOUNT=y
-# CONFIG_STANDALONE is not set
-CONFIG_DMA_CMA=y
-CONFIG_CMA_SIZE_MBYTES=0
-CONFIG_IMX_WEIM=y
-CONFIG_CONNECTOR=y
-CONFIG_MTD=y
-CONFIG_MTD_CMDLINE_PARTS=y
-CONFIG_MTD_BLOCK=y
-CONFIG_MTD_CFI=y
-CONFIG_MTD_JEDECPROBE=y
-CONFIG_MTD_CFI_INTELEXT=y
-CONFIG_MTD_CFI_AMDSTD=y
-CONFIG_MTD_CFI_STAA=y
-CONFIG_MTD_PHYSMAP_OF=y
-CONFIG_MTD_DATAFLASH=y
-CONFIG_MTD_M25P80=y
-CONFIG_MTD_SST25L=y
-CONFIG_MTD_NAND=y
-CONFIG_MTD_NAND_GPMI_NAND=y
-CONFIG_MTD_NAND_MXC=y
-CONFIG_MTD_SPI_NOR=y
-CONFIG_SPI_FSL_QUADSPI=y
-CONFIG_MTD_UBI=y
-CONFIG_BLK_DEV_LOOP=y
-CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_RAM_SIZE=65536
-CONFIG_SENSORS_FXOS8700=y
-CONFIG_SENSORS_FXAS2100X=y
-CONFIG_EEPROM_AT24=y
-CONFIG_EEPROM_AT25=y
-# CONFIG_SCSI_PROC_FS is not set
-CONFIG_BLK_DEV_SD=y
-CONFIG_SCSI_CONSTANTS=y
-CONFIG_SCSI_LOGGING=y
-CONFIG_SCSI_SCAN_ASYNC=y
-# CONFIG_SCSI_LOWLEVEL is not set
-CONFIG_ATA=y
-CONFIG_SATA_AHCI_PLATFORM=y
-CONFIG_AHCI_IMX=y
-CONFIG_PATA_IMX=y
-CONFIG_NETDEVICES=y
-# CONFIG_NET_VENDOR_BROADCOM is not set
-CONFIG_CS89x0=y
-CONFIG_CS89x0_PLATFORM=y
-# CONFIG_NET_VENDOR_FARADAY is not set
-# CONFIG_NET_VENDOR_INTEL is not set
-# CONFIG_NET_VENDOR_MARVELL is not set
-# CONFIG_NET_VENDOR_MICREL is not set
-# CONFIG_NET_VENDOR_MICROCHIP is not set
-# CONFIG_NET_VENDOR_NATSEMI is not set
-# CONFIG_NET_VENDOR_SEEQ is not set
-CONFIG_SMC91X=y
-CONFIG_SMC911X=y
-CONFIG_SMSC911X=y
-# CONFIG_NET_VENDOR_STMICRO is not set
-CONFIG_MICREL_PHY=y
-CONFIG_USB_PEGASUS=m
-CONFIG_USB_RTL8150=m
-CONFIG_USB_RTL8152=m
-CONFIG_USB_USBNET=m
-CONFIG_USB_NET_CDC_EEM=m
-CONFIG_BCMDHD=m
-CONFIG_BCMDHD_SDIO=y
-CONFIG_BCMDHD_FW_PATH="/lib/firmware/bcm/1DX_BCM4343W/fw_bcmdhd.bin"
-CONFIG_BCMDHD_NVRAM_PATH="/lib/firmware/bcm/1DX_BCM4343W/bcmdhd.1DX.SDIO.cal"
-# CONFIG_RTL_CARDS is not set
-# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
-CONFIG_INPUT_EVDEV=y
-CONFIG_INPUT_EVBUG=m
-CONFIG_KEYBOARD_GPIO=y
-CONFIG_KEYBOARD_IMX=y
-CONFIG_MOUSE_PS2=m
-CONFIG_MOUSE_PS2_ELANTECH=y
-CONFIG_INPUT_TOUCHSCREEN=y
-CONFIG_TOUCHSCREEN_HIMAX_HX852xES=y
-CONFIG_TOUCHSCREEN_HIMAX_I2C=y
-CONFIG_TOUCHSCREEN_HIMAX_DEBUG=y
-CONFIG_TOUCHSCREEN_ADS7846=y
-CONFIG_TOUCHSCREEN_EGALAX=y
-CONFIG_TOUCHSCREEN_ELAN_TS=y
-CONFIG_TOUCHSCREEN_MAX11801=y
-CONFIG_TOUCHSCREEN_IMX6UL_TSC=y
-CONFIG_TOUCHSCREEN_MC13783=y
-CONFIG_TOUCHSCREEN_TSC2007=y
-CONFIG_TOUCHSCREEN_STMPE=y
-CONFIG_INPUT_MISC=y
-CONFIG_INPUT_MMA8450=y
-CONFIG_SENSOR_FXLS8471=y
-CONFIG_INPUT_ISL29023=y
-CONFIG_SERIO_SERPORT=m
-# CONFIG_LEGACY_PTYS is not set
-# CONFIG_DEVKMEM is not set
-CONFIG_SERIAL_IMX=y
-CONFIG_SERIAL_IMX_CONSOLE=y
-CONFIG_SERIAL_FSL_LPUART=y
-CONFIG_SERIAL_FSL_LPUART_CONSOLE=y
-CONFIG_FSL_OTP=y
-# CONFIG_I2C_COMPAT is not set
-CONFIG_I2C_CHARDEV=y
-# CONFIG_I2C_HELPER_AUTO is not set
-CONFIG_I2C_ALGOPCF=m
-CONFIG_I2C_ALGOPCA=m
-CONFIG_I2C_IMX=y
-CONFIG_SPI=y
-CONFIG_SPI_GPIO=y
-CONFIG_SPI_IMX=y
-CONFIG_GPIO_SYSFS=y
-CONFIG_GPIO_MAX732X=y
-CONFIG_GPIO_PCA953X=y
-CONFIG_GPIO_74X164=y
-CONFIG_POWER_SUPPLY=y
-CONFIG_SABRESD_MAX8903=y
-CONFIG_POWER_RESET=y
-CONFIG_POWER_RESET_SYSCON_POWEROFF=y
-CONFIG_SENSORS_MAX17135=y
-CONFIG_SENSORS_MAG3110=y
-CONFIG_THERMAL=y
-CONFIG_CPU_THERMAL=y
-CONFIG_IMX_THERMAL=y
-CONFIG_DEVICE_THERMAL=y
-CONFIG_WATCHDOG=y
-CONFIG_IMX2_WDT=y
-CONFIG_MFD_DA9052_I2C=y
-CONFIG_MFD_MC13XXX_SPI=y
-CONFIG_MFD_MC13XXX_I2C=y
-CONFIG_MFD_MAX17135=y
-CONFIG_MFD_SI476X_CORE=y
-CONFIG_MFD_STMPE=y
-CONFIG_REGULATOR=y
-CONFIG_REGULATOR_FIXED_VOLTAGE=y
-CONFIG_REGULATOR_ANATOP=y
-CONFIG_REGULATOR_DA9052=y
-CONFIG_REGULATOR_GPIO=y
-CONFIG_REGULATOR_MAX17135=y
-CONFIG_REGULATOR_MC13783=y
-CONFIG_REGULATOR_MC13892=y
-CONFIG_REGULATOR_PFUZE100=y
-CONFIG_MEDIA_SUPPORT=y
-CONFIG_MEDIA_CAMERA_SUPPORT=y
-CONFIG_MEDIA_RADIO_SUPPORT=y
-CONFIG_MEDIA_RC_SUPPORT=y
-CONFIG_RC_DEVICES=y
-CONFIG_IR_GPIO_CIR=y
-CONFIG_MEDIA_USB_SUPPORT=y
-CONFIG_USB_VIDEO_CLASS=m
-CONFIG_V4L_PLATFORM_DRIVERS=y
-CONFIG_VIDEO_MXC_OUTPUT=y
-CONFIG_VIDEO_MXC_CAPTURE=m
-CONFIG_MXC_CAMERA_OV5640=m
-CONFIG_MXC_CAMERA_OV5642=m
-CONFIG_MXC_CAMERA_OV5640_MIPI=m
-CONFIG_MXC_TVIN_ADV7180=m
-CONFIG_MXC_IPU_DEVICE_QUEUE_SDC=m
-CONFIG_VIDEO_MXC_IPU_OUTPUT=y
-CONFIG_VIDEO_MXC_PXP_V4L2=y
-CONFIG_VIDEO_MXC_CSI_CAMERA=m
-CONFIG_MXC_VADC=m
-CONFIG_MXC_MIPI_CSI=m
-CONFIG_MXC_CAMERA_OV5647_MIPI=m
-CONFIG_SOC_CAMERA=y
-CONFIG_VIDEO_MX3=y
-CONFIG_V4L_MEM2MEM_DRIVERS=y
-CONFIG_VIDEO_CODA=y
-CONFIG_RADIO_SI476X=y
-CONFIG_SOC_CAMERA_OV2640=y
-CONFIG_DRM=y
-CONFIG_DRM_VIVANTE=y
-CONFIG_FB=y
-CONFIG_FB_MXS=y
-CONFIG_FB_MXC_SYNC_PANEL=y
-CONFIG_FB_MXC_MIPI_DSI=y
-CONFIG_FB_MXC_MIPI_DSI_SAMSUNG=y
-CONFIG_FB_MXC_TRULY_WVGA_SYNC_PANEL=y
-CONFIG_FB_MXC_TRULY_PANEL_TFT3P5079E=y
-CONFIG_FB_MXC_TRULY_PANEL_TFT3P5581E=y
-CONFIG_FB_MXC_TRULY_PANEL_TDO_QVGA0150A90049=y
-CONFIG_FB_MXC_TRULY_PANEL_TFT320RND=y
-CONFIG_FB_MXC_LDB=y
-CONFIG_FB_MXC_HDMI=y
-CONFIG_FB_MXS_SII902X=y
-CONFIG_FB_MXC_DCIC=m
-CONFIG_HANNSTAR_CABC=y
-CONFIG_FB_MXC_EINK_PANEL=y
-CONFIG_FB_MXC_EINK_V2_PANEL=y
-CONFIG_LCD_CLASS_DEVICE=y
-CONFIG_LCD_L4F00242T03=y
-CONFIG_LCD_PLATFORM=y
-CONFIG_BACKLIGHT_PWM=y
-CONFIG_FRAMEBUFFER_CONSOLE=y
-CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
-CONFIG_LOGO=y
-CONFIG_SOUND=y
-CONFIG_SND=y
-CONFIG_SND_USB_AUDIO=m
-CONFIG_SND_SOC=y
-CONFIG_SND_IMX_SOC=y
-CONFIG_SND_SOC_EUKREA_TLV320=y
-CONFIG_SND_SOC_IMX_WM8960=y
-CONFIG_SND_SOC_IMX_SII902X=y
-CONFIG_SND_SOC_IMX_WM8958=y
-CONFIG_SND_SOC_IMX_CS42888=y
-CONFIG_SND_SOC_IMX_WM8962=y
-CONFIG_SND_SOC_IMX_SGTL5000=y
-CONFIG_SND_SOC_IMX_MQS=y
-CONFIG_SND_SOC_IMX_SPDIF=y
-CONFIG_SND_SOC_IMX_MC13783=y
-CONFIG_SND_SOC_IMX_SI476X=y
-CONFIG_SND_SOC_IMX_HDMI=y
-CONFIG_SND_SIMPLE_CARD=y
-CONFIG_USB=y
-CONFIG_USB_OTG_WHITELIST=y
-CONFIG_USB_OTG_FSM=y
-CONFIG_USB_EHCI_HCD=y
-CONFIG_USB_EHCI_MXC=y
-CONFIG_USB_HCD_TEST_MODE=y
-CONFIG_USB_ACM=m
-CONFIG_USB_STORAGE=y
-CONFIG_USB_CHIPIDEA=y
-CONFIG_USB_CHIPIDEA_UDC=y
-CONFIG_USB_CHIPIDEA_HOST=y
-CONFIG_USB_SERIAL=m
-CONFIG_USB_SERIAL_GENERIC=y
-CONFIG_USB_SERIAL_FTDI_SIO=m
-CONFIG_USB_SERIAL_OPTION=m
-CONFIG_USB_EHSET_TEST_FIXTURE=y
-CONFIG_NOP_USB_XCEIV=y
-CONFIG_USB_MXS_PHY=y
-CONFIG_USB_GADGET=y
-CONFIG_USB_CONFIGFS=m
-CONFIG_USB_CONFIGFS_SERIAL=y
-CONFIG_USB_CONFIGFS_ACM=y
-CONFIG_USB_CONFIGFS_OBEX=y
-CONFIG_USB_CONFIGFS_NCM=y
-CONFIG_USB_CONFIGFS_ECM=y
-CONFIG_USB_CONFIGFS_ECM_SUBSET=y
-CONFIG_USB_CONFIGFS_RNDIS=y
-CONFIG_USB_CONFIGFS_EEM=y
-CONFIG_USB_CONFIGFS_MASS_STORAGE=y
-CONFIG_USB_CONFIGFS_F_LB_SS=y
-CONFIG_USB_CONFIGFS_F_FS=y
-CONFIG_USB_ZERO=m
-CONFIG_USB_ETH=m
-CONFIG_USB_G_NCM=m
-CONFIG_USB_GADGETFS=m
-CONFIG_USB_MASS_STORAGE=m
-CONFIG_USB_G_SERIAL=m
-CONFIG_MMC=y
-CONFIG_MMC_SDHCI=y
-CONFIG_MMC_SDHCI_PLTFM=y
-CONFIG_MMC_SDHCI_ESDHC_IMX=y
-CONFIG_MXC_IPU=y
-CONFIG_MXC_IPU_V3_PRE=y
-CONFIG_MXC_SIM=y
-CONFIG_MXC_MIPI_CSI2=y
-CONFIG_MXC_HDMI_CEC=y
-CONFIG_NEW_LEDS=y
-CONFIG_LEDS_CLASS=y
-CONFIG_LEDS_GPIO=y
-CONFIG_LEDS_TRIGGERS=y
-CONFIG_LEDS_TRIGGER_TIMER=y
-CONFIG_LEDS_TRIGGER_ONESHOT=y
-CONFIG_LEDS_TRIGGER_HEARTBEAT=y
-CONFIG_LEDS_TRIGGER_BACKLIGHT=y
-CONFIG_LEDS_TRIGGER_GPIO=y
-CONFIG_RTC_CLASS=y
-CONFIG_RTC_INTF_DEV_UIE_EMUL=y
-CONFIG_RTC_DRV_MC13XXX=y
-CONFIG_RTC_DRV_MXC=y
-CONFIG_RTC_DRV_SNVS=y
-CONFIG_DMADEVICES=y
-CONFIG_MXC_PXP_V2=y
-CONFIG_MXC_PXP_V3=y
-CONFIG_IMX_SDMA=y
-CONFIG_MXS_DMA=y
-CONFIG_DMATEST=m
-CONFIG_STAGING=y
-CONFIG_STAGING_MEDIA=y
-# CONFIG_IOMMU_SUPPORT is not set
-CONFIG_IIO=y
-CONFIG_IMX7D_ADC=y
-CONFIG_VF610_ADC=y
-CONFIG_INPUT_MPL3115=y
-CONFIG_PWM=y
-CONFIG_PWM_IMX=y
-CONFIG_EXT2_FS=y
-CONFIG_EXT2_FS_XATTR=y
-CONFIG_EXT2_FS_POSIX_ACL=y
-CONFIG_EXT2_FS_SECURITY=y
-CONFIG_EXT3_FS=y
-CONFIG_EXT3_FS_POSIX_ACL=y
-CONFIG_EXT3_FS_SECURITY=y
-CONFIG_EXT4_FS=y
-CONFIG_EXT4_FS_POSIX_ACL=y
-CONFIG_EXT4_FS_SECURITY=y
-CONFIG_QUOTA=y
-CONFIG_QUOTA_NETLINK_INTERFACE=y
-# CONFIG_PRINT_QUOTA_WARNING is not set
-CONFIG_AUTOFS4_FS=y
-CONFIG_FUSE_FS=y
-CONFIG_ISO9660_FS=m
-CONFIG_JOLIET=y
-CONFIG_ZISOFS=y
-CONFIG_UDF_FS=m
-CONFIG_MSDOS_FS=m
-CONFIG_VFAT_FS=y
-CONFIG_TMPFS=y
-CONFIG_JFFS2_FS=y
-CONFIG_UBIFS_FS=y
-CONFIG_NFS_FS=y
-CONFIG_NFS_V3_ACL=y
-CONFIG_NFS_V4=y
-CONFIG_ROOT_NFS=y
-CONFIG_NLS_DEFAULT="cp437"
-CONFIG_NLS_CODEPAGE_437=y
-CONFIG_NLS_ASCII=y
-CONFIG_NLS_ISO8859_1=y
-CONFIG_NLS_ISO8859_15=m
-CONFIG_NLS_UTF8=y
-CONFIG_DEBUG_FS=y
-CONFIG_MAGIC_SYSRQ=y
-# CONFIG_SCHED_DEBUG is not set
-# CONFIG_DEBUG_BUGVERBOSE is not set
-# CONFIG_FTRACE is not set
-CONFIG_SECURITYFS=y
-CONFIG_CRYPTO_USER=y
-CONFIG_CRYPTO_TEST=m
-CONFIG_CRYPTO_CBC=y
-CONFIG_CRYPTO_CTS=y
-CONFIG_CRYPTO_LRW=y
-CONFIG_CRYPTO_XTS=y
-CONFIG_CRYPTO_MD4=y
-CONFIG_CRYPTO_MD5=y
-CONFIG_CRYPTO_MICHAEL_MIC=y
-CONFIG_CRYPTO_RMD128=y
-CONFIG_CRYPTO_RMD160=y
-CONFIG_CRYPTO_RMD256=y
-CONFIG_CRYPTO_RMD320=y
-CONFIG_CRYPTO_SHA1=y
-CONFIG_CRYPTO_SHA512=y
-CONFIG_CRYPTO_TGR192=y
-CONFIG_CRYPTO_WP512=y
-CONFIG_CRYPTO_BLOWFISH=y
-CONFIG_CRYPTO_CAMELLIA=y
-CONFIG_CRYPTO_DES=y
-CONFIG_CRYPTO_TWOFISH=y
-# CONFIG_CRYPTO_ANSI_CPRNG is not set
-CONFIG_CRYPTO_DEV_FSL_CAAM=y
-CONFIG_CRYPTO_DEV_FSL_CAAM_SM=y
-CONFIG_CRYPTO_DEV_FSL_CAAM_SM_TEST=y
-CONFIG_CRYPTO_DEV_FSL_CAAM_SECVIO=y
-CONFIG_CRC_CCITT=m
-CONFIG_CRC_T10DIF=y
-CONFIG_CRC7=m
-CONFIG_LIBCRC32C=m
-CONFIG_FONTS=y
-CONFIG_FONT_8x8=y
-CONFIG_FONT_8x16=y
diff --git a/meta-fsl-extras/recipes-kernel/linux/linux-warp7_4.1.bb b/meta-fsl-extras/recipes-kernel/linux/linux-warp7_4.1.bb
deleted file mode 100644
index 71341dc2..00000000
--- a/meta-fsl-extras/recipes-kernel/linux/linux-warp7_4.1.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright (C) 2016 NXP Semiconductors
-# Released under the MIT license (see COPYING.MIT for the terms)
-
-include recipes-kernel/linux/linux-fslc.inc
-
-DESCRIPTION = "Linux kernel based on linux-fsl-imx branch 4.1-1.0.x-imx from FSL Community BSP \
-with additional patches to cover devices specific on WaRP7 board."
-
-DEPENDS += "lzop-native bc-native"
-
-SRCBRANCH = "4.1-1.0.x-imx"
-SRCREV = "a543d1bd884028bed97c06ae4087e051a9176499"
-LOCALVERSION = "-${SRCBRANCH}-warp7"
-
-SRC_URI = "git://github.com/warp7/linux-fslc.git;branch=${SRCBRANCH} \
-           file://defconfig"
-
-COMPATIBLE_MACHINE = "(imx7s-warp)"
diff --git a/meta-fsl-extras/recipes-kernel/linux/linux-warp7_4.1.bbappend b/meta-fsl-extras/recipes-kernel/linux/linux-warp7_4.1.bbappend
deleted file mode 100644
index efe83a37..00000000
--- a/meta-fsl-extras/recipes-kernel/linux/linux-warp7_4.1.bbappend
+++ /dev/null
@@ -1,53 +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 \
-        file://0001-ARM-fix-put_user-for-gcc-8.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-kernel/perf/perf.bbappend b/meta-fsl-extras/recipes-kernel/perf/perf.bbappend
deleted file mode 100644
index c4bd322e..00000000
--- a/meta-fsl-extras/recipes-kernel/perf/perf.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$
-##
-############################################################################
-
-PERF_SRC_append_imx7s-warp = " lib"
-PERF_SRC_remove_imx7s-warp = "tools/arch"
diff --git a/meta-fsl-extras/recipes-multimedia/gstreamer/gstreamer1.0-libav.inc b/meta-fsl-extras/recipes-multimedia/gstreamer/gstreamer1.0-libav.inc
deleted file mode 100644
index c2283061..00000000
--- a/meta-fsl-extras/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-fsl-extras/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.14.0.bb b/meta-fsl-extras/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.14.0.bb
deleted file mode 100644
index 52b52781..00000000
--- a/meta-fsl-extras/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-fsl-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly.inc b/meta-fsl-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly.inc
deleted file mode 100644
index 1db3bc9b..00000000
--- a/meta-fsl-extras/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-fsl-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.14.0.bb b/meta-fsl-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.14.0.bb
deleted file mode 100644
index ebc1da0f..00000000
--- a/meta-fsl-extras/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-fsl-extras/recipes-qt/boot2qt-addons/default-qt-envs.bbappend b/meta-fsl-extras/recipes-qt/boot2qt-addons/default-qt-envs.bbappend
deleted file mode 100644
index b4aa97d9..00000000
--- a/meta-fsl-extras/recipes-qt/boot2qt-addons/default-qt-envs.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$
-##
-############################################################################
-
-do_configure_append() {
-    echo "FB_MULTI_BUFFER=2" >> ${WORKDIR}/defaults
-    echo "QT_QPA_EGLFS_FORCEVSYNC=1" >> ${WORKDIR}/defaults
-    echo "QT_GSTREAMER_CAMERABIN_VIDEOSRC=mxc_v4l2=imxv4l2videosrc,v4l2src" >> ${WORKDIR}/defaults
-}
-
-do_configure_append_mx8() {
-    echo "QT_QPA_EGLFS_FORCE888=1" >> ${WORKDIR}/defaults
-}
diff --git a/meta-fsl-extras/wic/imx8-uboot-bootpart.wks.in b/meta-fsl-extras/wic/imx8-uboot-bootpart.wks.in
deleted file mode 100644
index fb79978c..00000000
--- a/meta-fsl-extras/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
author	Samuli Piippo <samuli.piippo@qt.io>	2019-08-29 15:53:47 +0300
committer	Samuli Piippo <samuli.piippo@qt.io>	2019-09-20 12:39:50 +0300
commit	8b14714e95a2d82f9747c08be494a09ddf2f01be (patch)
tree	f7b8d64043abea230264d4892502896ca1757640 /meta-fsl-extras
parent	61c40f565769b34f82c57aedf3f730f23b9f7c03 (diff)