toradex: stop using meta-toradex

All needed toradex recipes are now in meta-fsl-arm-extra

Change-Id: I3eedacd83845087d2369cf4d4b6df2a030d6d283
Reviewed-by: Teemu Holappa <teemu.holappa@theqtcompany.com>

32 files changed, 12 insertions, 397 deletions

diff --git a/b2qt-init-build-env b/b2qt-init-build-env
index 1f07d46..a1f0efb 100755
--- a/b2qt-init-build-env
+++ b/b2qt-init-build-env
@@ -107,7 +107,7 @@ get_groups() {
       PROJECT_GROUPS="external"
     ;;
     apalis-imx6|colibri-imx6|colibri-vf|colibri-imx7)
-      PROJECT_GROUPS="toradex"
+      PROJECT_GROUPS="fsl"
     ;;
     imx6qsabresd|imx6dlsabresd|nitrogen6x|imx7dsabresd)
       PROJECT_GROUPS="fsl"
diff --git a/conf/bblayers.conf.sample b/conf/bblayers.conf.sample
index 6bd83c8..95b4e3f 100644
--- a/conf/bblayers.conf.sample
+++ b/conf/bblayers.conf.sample
@@ -43,14 +43,12 @@ BBLAYERS ?= " \
   ${BSPDIR}/sources/meta-beagleboard/common-bsp \
   ${BSPDIR}/sources/meta-ti \
   ${BSPDIR}/sources/meta-raspberrypi \
-  ${BSPDIR}/sources/meta-toradex \
   ${BSPDIR}/sources/meta-openembedded/meta-oe \
   ${BSPDIR}/sources/meta-openembedded/meta-multimedia \
   ${BSPDIR}/sources/meta-boot2qt \
   ${BSPDIR}/sources/meta-boot2qt/meta-ti-extras \
   ${BSPDIR}/sources/meta-boot2qt/meta-fsl-extras \
   ${BSPDIR}/sources/meta-boot2qt/meta-beagleboard-extras \
-  ${BSPDIR}/sources/meta-boot2qt/meta-toradex-extras \
   ${BSPDIR}/sources/meta-mingw \
   ${BSPDIR}/sources/meta-qt5 \
   "
diff --git a/conf/bblayers.conf.toradex.sample b/conf/bblayers.conf.toradex.sample
deleted file mode 100644
index 9472025..0000000
--- a/conf/bblayers.conf.toradex.sample
+++ /dev/null
@@ -1,54 +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$
-##
-############################################################################
-
-# POKY_BBLAYERS_CONF_VERSION is increased each time build/conf/bblayers.conf
-# changes incompatibly
-POKY_BBLAYERS_CONF_VERSION = "2"
-
-BBPATH = "${TOPDIR}"
-BBFILES ?= ""
-BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..')}"
-
-BBLAYERS ?= " \
-  ${BSPDIR}/sources/poky/meta \
-  ${BSPDIR}/sources/poky/meta-poky \
-  ${BSPDIR}/sources/meta-toradex \
-  ${BSPDIR}/sources/meta-fsl-arm \
-  ${BSPDIR}/sources/meta-fsl-arm-extra \
-  ${BSPDIR}/sources/meta-openembedded/meta-oe \
-  ${BSPDIR}/sources/meta-openembedded/meta-python \
-  ${BSPDIR}/sources/meta-openembedded/meta-networking \
-  ${BSPDIR}/sources/meta-openembedded/meta-initramfs \
-  ${BSPDIR}/sources/meta-openembedded/meta-multimedia \
-  ${BSPDIR}/sources/meta-boot2qt \
-  ${BSPDIR}/sources/meta-boot2qt/meta-fsl-extras \
-  ${BSPDIR}/sources/meta-boot2qt/meta-toradex-extras \
-  ${BSPDIR}/sources/meta-mingw \
-  ${BSPDIR}/sources/meta-qt5 \
-  "
diff --git a/conf/distro/include/apalis-imx6.conf b/conf/distro/include/apalis-imx6.conf
index fdc211d..58bcdba 100644
--- a/conf/distro/include/apalis-imx6.conf
+++ b/conf/distro/include/apalis-imx6.conf
@@ -27,7 +27,6 @@
 ##
 ############################################################################
 
-include conf/distro/include/toradex.inc
 include conf/distro/include/imx6.inc
 include conf/distro/include/imx6-egl.inc
 
diff --git a/conf/distro/include/colibri-imx6.conf b/conf/distro/include/colibri-imx6.conf
index 6427ee9..eabaf91 100644
--- a/conf/distro/include/colibri-imx6.conf
+++ b/conf/distro/include/colibri-imx6.conf
@@ -27,7 +27,6 @@
 ##
 ############################################################################
 
-include conf/distro/include/toradex.inc
 include conf/distro/include/imx6.inc
 include conf/distro/include/imx6-egl.inc
 
diff --git a/conf/distro/include/colibri-imx7.conf b/conf/distro/include/colibri-imx7.conf
index 722da17..193e6aa 100644
--- a/conf/distro/include/colibri-imx7.conf
+++ b/conf/distro/include/colibri-imx7.conf
@@ -20,8 +20,6 @@
 ##
 #############################################################################
 
-include conf/distro/include/toradex.inc
-
 DEPLOY_CONF_NAME = "Toradex Colibri iMX7"
 
 IMAGE_FSTYPES += "ext3 sdcard"
diff --git a/conf/distro/include/colibri-vf.conf b/conf/distro/include/colibri-vf.conf
index db970fd..e4fdd93 100644
--- a/conf/distro/include/colibri-vf.conf
+++ b/conf/distro/include/colibri-vf.conf
@@ -27,14 +27,6 @@
 ##
 ############################################################################
 
-include conf/distro/include/toradex.inc
-
-BBMASK += "\
-    meta-fsl-arm-extra/recipes-kernel/kernel-module-mcc-toradex \
-    meta-fsl-arm-extra/recipes-kernel/kernel-modules/kernel-module-mcc_2.1.01.bb \
-    meta-fsl-arm-extra/recipes-bsp/mqxboot \
-    "
-
 DEPLOY_CONF_NAME = "Toradex Colibri VF"
 
 IMAGE_FSTYPES += "ext3 sdcard"
diff --git a/conf/distro/include/toradex.inc b/conf/distro/include/toradex.inc
deleted file mode 100644
index 54df01a..0000000
--- a/conf/distro/include/toradex.inc
+++ /dev/null
@@ -1,56 +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$
-##
-############################################################################
-
-BBMASK += "\
-    meta-toradex/recipes-mozilla \
-    meta-toradex/recipes-browser \
-    meta-toradex/recipes-lxde \
-    meta-toradex/recipes-connectivity \
-    meta-toradex/recipes-gnome \
-    meta-toradex/recipes/trdx-config \
-    meta-toradex/recipes-multimedia/webm \
-    meta-toradex/recipes-qt \
-    meta-toradex/recipes-core/psplash \
-    meta-toradex/recipes-support/florence \
-    meta-toradex/recipes-core/systemd \
-    meta-toradex/recipes-efl \
-    meta-toradex/recipes-core/dropbear \
-    meta-toradex/recipes-support/icu \
-    meta-toradex/recipes-support/i2c-tools \
-    meta-toradex/recipes-benchmark \
-    meta-toradex/recipes-core/udev \
-    meta-toradex/recipes-support/gnutls \
-    meta-toradex/recipes-graphics/gpu-viv-bin-mx6q \
-    meta-toradex/recipes-multimedia/gstreamer \
-    meta-toradex/recipes-fsl/packagegroups \
-    meta-toradex/recipes-core/glibc \
-    meta-toradex/recipes-sato/webkit \
-    meta-toradex/recipes-bsp/binary-drivers/cudatoolkit6.5 \
-    meta-toradex/recipes-bsp/binary-drivers/opencv4tegra \
-    "
diff --git a/meta-toradex-extras/recipes/linux/linux-toradex_3.14.%.bbappend b/meta-fsl-extras/recipes/linux/linux-toradex_3.14.%.bbappend
index b696b19..b696b19 100644
--- a/meta-toradex-extras/recipes/linux/linux-toradex_3.14.%.bbappend
+++ b/meta-fsl-extras/recipes/linux/linux-toradex_3.14.%.bbappend
diff --git a/meta-toradex-extras/recipes/linux/linux-toradex_4.%.bbappend b/meta-fsl-extras/recipes/linux/linux-toradex_4.%.bbappend
index 77ce484..77ce484 100644
--- a/meta-toradex-extras/recipes/linux/linux-toradex_4.%.bbappend
+++ b/meta-fsl-extras/recipes/linux/linux-toradex_4.%.bbappend
diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex.bb b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex.bb
index bb209ad..bb209ad 100644
--- a/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex.bb
+++ b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex.bb
diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/mx6/flash_blk.scr b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/mx6/flash_blk.scr
index ee87e85..ee87e85 100644
--- a/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/mx6/flash_blk.scr
+++ b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/mx6/flash_blk.scr
diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/mx6/flash_mmc.scr b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/mx6/flash_mmc.scr
index 207c7db..207c7db 100644
--- a/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/mx6/flash_mmc.scr
+++ b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/mx6/flash_mmc.scr
diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/mx7/flash_blk.scr b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/mx7/flash_blk.scr
index 3e05a85..3e05a85 100644
--- a/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/mx7/flash_blk.scr
+++ b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/mx7/flash_blk.scr
diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/mx7/flash_mmc.scr b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/mx7/flash_mmc.scr
index 0c16652..0c16652 100644
--- a/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/mx7/flash_mmc.scr
+++ b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/mx7/flash_mmc.scr
diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/vf/flash_blk.scr b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/vf/flash_blk.scr
index be8ec8d..be8ec8d 100644
--- a/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/vf/flash_blk.scr
+++ b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/vf/flash_blk.scr
diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/vf/flash_mmc.scr b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/vf/flash_mmc.scr
index e0770a0..e0770a0 100644
--- a/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/vf/flash_mmc.scr
+++ b/meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/vf/flash_mmc.scr
diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-toradex/0001-Update-default-args-for-apalis-imx6.patch b/meta-fsl-extras/recipes/u-boot/u-boot-toradex/0001-Update-default-args-for-apalis-imx6.patch
index b7c7d63..5a456c5 100644
--- a/meta-toradex-extras/recipes/u-boot/u-boot-toradex/0001-Update-default-args-for-apalis-imx6.patch
+++ b/meta-fsl-extras/recipes/u-boot/u-boot-toradex/0001-Update-default-args-for-apalis-imx6.patch
@@ -1,19 +1,18 @@
-From 94531a3ecaea073316b9e4c341085ce5e277bd9f Mon Sep 17 00:00:00 2001
+From 4569a8b4997340aae34365f2f896b842f8cc114b Mon Sep 17 00:00:00 2001
 From: Samuli Piippo <samuli.piippo@digia.com>
 Date: Mon, 27 Oct 2014 14:53:25 +0200
 Subject: [PATCH] Update default args for apalis imx6
 
-Boot from sd card by default, disable kernel logs from tty1, and
-disable cursor blinking.
+Boot from sd card by default
 ---
- include/configs/apalis_imx6.h | 15 ++++++++-------
- 1 file changed, 8 insertions(+), 7 deletions(-)
+ include/configs/apalis_imx6.h | 13 +++++++------
+ 1 file changed, 7 insertions(+), 6 deletions(-)
 
 diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h
-index e7d0d20..a1d425d 100644
+index 3ea4a5c..53d9a0c 100644
 --- a/include/configs/apalis_imx6.h
 +++ b/include/configs/apalis_imx6.h
-@@ -251,14 +251,14 @@
+@@ -252,14 +252,14 @@
                 "&& setenv dtbparam \" - ${fdt_addr_r}\" && true\0"
  
  #define SD_BOOTCMD                                             \
@@ -33,7 +32,7 @@ index e7d0d20..a1d425d 100644
                 "${fdt_file} && setenv dtbparam \" - ${fdt_addr_r}\" && true\0"
  
  #define USB_BOOTCMD \
-@@ -278,7 +278,8 @@
+@@ -279,7 +279,8 @@
  #define FDT_FILE "imx6q-apalis_v1_0-eval.dtb"
  #endif
  #define CONFIG_EXTRA_ENV_SETTINGS \
@@ -43,15 +42,6 @@ index e7d0d20..a1d425d 100644
                 "run nfsboot ; echo ; echo nfsboot failed ; " \
                 "usb start ;" \
                 "setenv stdout serial,vga ; setenv stdin serial,usbkbd\0" \
-@@ -299,7 +300,7 @@
-                "|| setenv drive 2; load ${interface} ${drive}:1 " \
-                "${kernel_addr_r} flash_blk.img\0" \
-        "setup=setenv setupargs fec_mac=${ethaddr} " \
--               "consoleblank=0  no_console_suspend=1 console=tty1 " \
-+               "consoleblank=0  no_console_suspend=1 vt.global_cursor_default=0 " \
-                "console=${console},${baudrate}n8\0 " \
-        "setupdate=run setsdupdate || run setusbupdate || run setethupdate;" \
-                " source ${kernel_addr_r}\0" \
 -- 
 1.9.1
 
diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-toradex/0001-colibri-imx7-fix-update-u-boot.patch b/meta-fsl-extras/recipes/u-boot/u-boot-toradex/0001-colibri-imx7-fix-update-u-boot.patch
index 501ad33..501ad33 100644
--- a/meta-toradex-extras/recipes/u-boot/u-boot-toradex/0001-colibri-imx7-fix-update-u-boot.patch
+++ b/meta-fsl-extras/recipes/u-boot/u-boot-toradex/0001-colibri-imx7-fix-update-u-boot.patch
diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-toradex/0001-colibri-vf-remove-console-from-tty1.patch b/meta-fsl-extras/recipes/u-boot/u-boot-toradex/0001-colibri-vf-remove-console-from-tty1.patch
index b54a4ae..b54a4ae 100644
--- a/meta-toradex-extras/recipes/u-boot/u-boot-toradex/0001-colibri-vf-remove-console-from-tty1.patch
+++ b/meta-fsl-extras/recipes/u-boot/u-boot-toradex/0001-colibri-vf-remove-console-from-tty1.patch
diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-toradex/0002-colibri-vf-fix-mmc-boot.patch b/meta-fsl-extras/recipes/u-boot/u-boot-toradex/0002-colibri-vf-fix-mmc-boot.patch
index 25476dd..25476dd 100644
--- a/meta-toradex-extras/recipes/u-boot/u-boot-toradex/0002-colibri-vf-fix-mmc-boot.patch
+++ b/meta-fsl-extras/recipes/u-boot/u-boot-toradex/0002-colibri-vf-fix-mmc-boot.patch
diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-toradex_2015.04.bbappend b/meta-fsl-extras/recipes/u-boot/u-boot-toradex_2015.04.bbappend
index bdae0b8..cb94605 100644
--- a/meta-toradex-extras/recipes/u-boot/u-boot-toradex_2015.04.bbappend
+++ b/meta-fsl-extras/recipes/u-boot/u-boot-toradex_2015.04.bbappend
@@ -31,6 +31,7 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 SRC_URI += " \
         file://0001-colibri-vf-remove-console-from-tty1.patch \
         file://0002-colibri-vf-fix-mmc-boot.patch \
+        file://0001-Update-default-args-for-apalis-imx6.patch \
         file://0001-colibri-imx7-fix-update-u-boot.patch \
         "
 
diff --git a/meta-toradex-extras/conf/layer.conf b/meta-toradex-extras/conf/layer.conf
deleted file mode 100644
index 06eb3c7..0000000
--- a/meta-toradex-extras/conf/layer.conf
+++ /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$
-##
-############################################################################
-
-# 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_toradex"
-BBFILE_PATTERN_b2qt_toradex := "^${LAYERDIR}/"
-BBFILE_PRIORITY_b2qt_toradex = "20"
diff --git a/meta-toradex-extras/recipes/base-files/base-files/b2qt/fstab b/meta-toradex-extras/recipes/base-files/base-files/b2qt/fstab
deleted file mode 100644
index 12e0489..0000000
--- a/meta-toradex-extras/recipes/base-files/base-files/b2qt/fstab
+++ /dev/null
@@ -1,15 +0,0 @@
-# stock fstab - you probably want to override this with a machine specific one
-
-/dev/root            /                    auto       defaults              1  1
-proc                 /proc                proc       defaults              0  0
-debugfs              /sys/kernel/debug    debugfs    defaults              0  0
-devpts               /dev/pts             devpts     mode=0620,gid=5       0  0
-usbfs                /proc/bus/usb        usbfs      noauto
-tmpfs                /var/volatile        tmpfs      defaults              0  0
-tmpfs                /run                 tmpfs      mode=0755,nodev,nosuid,strictatime 0  0
-tmpfs                /dev/shm             tmpfs      mode=0777             0  0
-tmpfs                /media/ram           tmpfs      defaults              0  0
-
-# uncomment this if your device has a SD/MMC/Transflash slot
-#/dev/mmcblk0p1       /media/card          auto       defaults,sync,noauto  0  0
-
diff --git a/meta-toradex-extras/recipes/base-files/base-files_3.0.14.bbappend b/meta-toradex-extras/recipes/base-files/base-files_3.0.14.bbappend
deleted file mode 100644
index dbeb030..0000000
--- a/meta-toradex-extras/recipes/base-files/base-files_3.0.14.bbappend
+++ /dev/null
@@ -1,30 +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}/${PN}:"
diff --git a/meta-toradex-extras/recipes/linux/linux-toradex/0001-Allow-builds-with-GCC-4.8.patch b/meta-toradex-extras/recipes/linux/linux-toradex/0001-Allow-builds-with-GCC-4.8.patch
deleted file mode 100644
index 43edec3..0000000
--- a/meta-toradex-extras/recipes/linux/linux-toradex/0001-Allow-builds-with-GCC-4.8.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 30c67656c09f49608bbadb75e365d1d3da36cc70 Mon Sep 17 00:00:00 2001
-From: Andy Nichols <andy.nichols@theqtcompany.com>
-Date: Wed, 18 Feb 2015 14:28:14 +0100
-Subject: [PATCH] Allow builds with GCC 4.8
-
----
- arch/arm/kernel/asm-offsets.c | 4 ----
- 1 file changed, 4 deletions(-)
-
-diff --git a/arch/arm/kernel/asm-offsets.c b/arch/arm/kernel/asm-offsets.c
-index 2d2d608..6f8e79c 100644
---- a/arch/arm/kernel/asm-offsets.c
-+++ b/arch/arm/kernel/asm-offsets.c
-@@ -49,10 +49,6 @@
- #error Your compiler is too buggy; it is known to miscompile kernels.
- #error    Known good compilers: 3.3, 4.x
- #endif
--#if GCC_VERSION >= 40800 && GCC_VERSION < 40803
--#error Your compiler is too buggy; it is known to miscompile kernels
--#error and result in filesystem corruption and oopses.
--#endif
- #endif
- 
- int main(void)
--- 
-1.9.1
-
diff --git a/meta-toradex-extras/recipes/linux/linux-toradex/0001-Enable-Fusion-7-and-10-multi-touch-controller.patch b/meta-toradex-extras/recipes/linux/linux-toradex/0001-Enable-Fusion-7-and-10-multi-touch-controller.patch
deleted file mode 100644
index d92ac62..0000000
--- a/meta-toradex-extras/recipes/linux/linux-toradex/0001-Enable-Fusion-7-and-10-multi-touch-controller.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From d57edef022af184015a8ccd87fa9021024513d55 Mon Sep 17 00:00:00 2001
-From: Andy Nichols <andy.nichols@theqtcompany.com>
-Date: Fri, 6 Mar 2015 10:14:13 +0100
-Subject: [PATCH] Enable Fusion 7 and 10 multi-touch controller
-
----
- arch/arm/boot/dts/vf-colibri-eval-v3.dtsi | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/arch/arm/boot/dts/vf-colibri-eval-v3.dtsi b/arch/arm/boot/dts/vf-colibri-eval-v3.dtsi
-index 1f43dbe..9194580 100644
---- a/arch/arm/boot/dts/vf-colibri-eval-v3.dtsi
-+++ b/arch/arm/boot/dts/vf-colibri-eval-v3.dtsi
-@@ -214,7 +214,7 @@
-                gpios = <&gpio0 30 GPIO_ACTIVE_HIGH /* SO-DIMM 28, Pen down interrupt */
-                         &gpio0 23 GPIO_ACTIVE_LOW /* SO-DIMM 30, Reset interrupt */
-                        >;
--               status = "disabled";
-+               status = "okay";
-        };
- 
-        /* M41T0M6 real time clock on carrier board */
--- 
-2.3.1
-
diff --git a/meta-toradex-extras/recipes/linux/linux-toradex_git.bbappend b/meta-toradex-extras/recipes/linux/linux-toradex_git.bbappend
deleted file mode 100644
index 5352ed7..0000000
--- a/meta-toradex-extras/recipes/linux/linux-toradex_git.bbappend
+++ /dev/null
@@ -1,39 +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-base = ""
-
-config_script () {
-    # FunctionFS for adb
-    echo "CONFIG_USB_FUNCTIONFS=m"  >> ${S}/.config
-    echo "CONFIG_USB_ACM=m"         >> ${S}/.config
-}
-
-B = "${S}"
diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-toradex/0001-colibri-imx6-enable-sdboot-by-default.patch b/meta-toradex-extras/recipes/u-boot/u-boot-toradex/0001-colibri-imx6-enable-sdboot-by-default.patch
deleted file mode 100644
index 0743128..0000000
--- a/meta-toradex-extras/recipes/u-boot/u-boot-toradex/0001-colibri-imx6-enable-sdboot-by-default.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 10ebeba59e6fd25352aa44ecd85913126ec45afe Mon Sep 17 00:00:00 2001
-From: Samuli Piippo <samuli.piippo@theqtcompany.com>
-Date: Wed, 24 Feb 2016 15:39:52 +0200
-Subject: [PATCH] colibri imx6: enable sdboot by default
-
-remove console from tty1
----
- include/configs/colibri_imx6.h | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h
-index c545334..eb0dfa9 100644
---- a/include/configs/colibri_imx6.h
-+++ b/include/configs/colibri_imx6.h
-@@ -242,7 +242,8 @@
- 
- #define FDT_FILE "imx6dl-colibri-eval-v3.dtb"
- #define CONFIG_EXTRA_ENV_SETTINGS \
--       "bootcmd=run emmcboot ; echo ; echo emmcboot failed ; " \
-+       "bootcmd=run sdboot ; echo ; echo sdboot failed ; " \
-+        "run emmcboot ; echo ; echo emmcboot failed ; " \
-                "run nfsboot ; echo ; echo nfsboot failed ; " \
-                "usb start ;" \
-                "setenv stdout serial,vga ; setenv stdin serial,usbkbd\0" \
-@@ -261,7 +262,7 @@
-        "setsdupdate=setenv interface mmc; setenv drive 1; mmc rescan; " \
-                "load ${interface} ${drive}:1 ${kernel_addr_r} flash_blk.img\0" \
-        "setup=setenv setupargs fec_mac=${ethaddr} " \
--               "consoleblank=0  no_console_suspend=1 console=tty1 " \
-+               "consoleblank=0  no_console_suspend=1 " \
-                "console=${console},${baudrate}n8\0 " \
-        "setupdate=run setsdupdate || run setusbupdate || run setethupdate;" \
-                " source ${kernel_addr_r}\0" \
--- 
-1.9.1
-
diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-toradex_git.bbappend b/meta-toradex-extras/recipes/u-boot/u-boot-toradex_git.bbappend
deleted file mode 100644
index 45b5fd3..0000000
--- a/meta-toradex-extras/recipes/u-boot/u-boot-toradex_git.bbappend
+++ /dev/null
@@ -1,34 +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}/${PN}:"
-SRC_URI += " \
-        file://0001-Update-default-args-for-apalis-imx6.patch \
-        file://0001-colibri-imx6-enable-sdboot-by-default.patch \
-        "
diff --git a/scripts/manifest.xml b/scripts/manifest.xml
index 6c6f727..f6e6f84 100644
--- a/scripts/manifest.xml
+++ b/scripts/manifest.xml
@@ -7,7 +7,6 @@
   <remote fetch="git://git.openembedded.org" name="oe"/>
   <remote fetch="git://github.com/Freescale" name="freescale"/>
   <remote fetch="git://github.com/beagleboard" name="beagleboard"/>
-  <remote fetch="git://git.toradex.com" name="toradex"/>
   <remote fetch="git://github.com/architech-boards" name="architech"/>
   <remote fetch="git://github.com/meta-qt5" name="meta-qt5"/>
   <remote fetch="http://codereview.qt-project.org/yocto" name="qtyocto"/>
@@ -36,7 +35,7 @@
            remote="yocto"
            revision="a6b95df4d7ab122f1e5b7632e2273b75f853af4b"
            path="sources/meta-fsl-arm"
-           groups="notdefault,external,fsl,toradex,architech,ti,bbb,smx6,renesas"/>
+           groups="notdefault,external,fsl,architech,ti,bbb,smx6,renesas"/>
   <project name="meta-ti"
            remote="yocto"
            revision="f807c7185321fb407e82c529ddff310dc037f727"
@@ -51,17 +50,12 @@
            remote="freescale"
            revision="99649b72f60fda4a2cfb2333791fe0f92997fa9e"
            path="sources/meta-fsl-arm-extra"
-           groups="notdefault,external,fsl,toradex,architech,smx6"/>
+           groups="notdefault,external,fsl,architech,smx6"/>
   <project name="meta-beagleboard"
            remote="beagleboard"
            revision="b5c709b2b6bd3bf236df923fa8f245a00fbb1b60"
            path="sources/meta-beagleboard"
            groups="notdefault,external,bbb"/>
-  <project name="meta-toradex"
-           remote="toradex"
-           revision="485643678b2d39d37b1cc9d1aa2200bb934b08de"
-           path="sources/meta-toradex"
-           groups="notdefault,external,toradex"/>
   <project name="meta-tibidabo"
            remote="architech"
            revision="06c6b09e0776507e1230aa98b5ca10d9d3968286"
diff --git a/scripts/setup-environment.sh b/scripts/setup-environment.sh
index 8da1b94..9b40650 100755
--- a/scripts/setup-environment.sh
+++ b/scripts/setup-environment.sh
@@ -57,7 +57,7 @@ BUILDDIRECTORY=${BUILDDIRECTORY:-build-${MACHINE}}
 if [ ! -f ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf ]; then
   case ${MACHINE} in
     apalis-imx6|colibri-imx6|colibri-vf|colibri-imx7)
-      LAYERSCONF="bblayers.conf.toradex.sample"
+      LAYERSCONF="bblayers.conf.fsl.sample"
     ;;
     imx6qsabresd|imx6dlsabresd|nitrogen6x|imx7dsabresd)
       LAYERSCONF="bblayers.conf.fsl.sample"