diff --git a/conf/machine/colibri-vf.conf b/conf/machine/colibri-vf.conf
index 435c105..8707690 100644
--- a/conf/machine/colibri-vf.conf
+++ b/conf/machine/colibri-vf.conf
@@ -4,12 +4,12 @@
 #@DESCRIPTION: Machine configuration for Toradex Colibri VF50/VF61 powered by Freescale Vybrid SoC
 #@MAINTAINER: Max Krummenacher <max.krummenacher@toradex.com>
 
-MACHINEOVERRIDES =. "vf:vf50:vf60:"
+MACHINEOVERRIDES =. "vf:"
 
 include conf/machine/include/imx-base.inc
 include conf/machine/include/arm/armv7a/tune-cortexa5.inc
 
-PREFERRED_PROVIDER_virtual/kernel:use-nxp-bsp ??= "linux-toradex"
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-toradex"
 
 KERNEL_IMAGETYPE = "zImage"
 
diff --git a/recipes-bsp/libmcc/libmcc/0001-Makefile-use-oe-ldflags.patch b/recipes-bsp/libmcc/libmcc/0001-Makefile-use-oe-ldflags.patch
new file mode 100644
index 0000000..5291d55
--- /dev/null
+++ b/recipes-bsp/libmcc/libmcc/0001-Makefile-use-oe-ldflags.patch
@@ -0,0 +1,29 @@
+From ba86203da14d21c9c48dcf02595d71901875a263 Mon Sep 17 00:00:00 2001
+From: Max Krummenacher <max.krummenacher@toradex.com>
+Date: Thu, 23 Jun 2022 08:31:46 +0000
+Subject: [PATCH] Makefile: use oe ldflags
+
+Prevents QA error about missing GNU_HASH in the binary.
+
+Upstream-Status: Pending
+Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index 4482baf..34afbd4 100644
+--- a/Makefile
++++ b/Makefile
+@@ -8,7 +8,7 @@ build/libmcc.a: build/libmcc.o
+ 	$(AR) rcs $@ $<
+ 
+ build/libmcc.so.1.0: build/libmcc.o
+-	$(CC) -shared -Wl,-soname,libmcc.so.1 -o $@ $< -lc
++	$(CC) $(LDFLAGS) -shared -Wl,-soname,libmcc.so.1 -o $@ $< -lc
+ 
+ install:
+ 	mkdir -p $(DESTDIR)/usr/include $(DESTDIR)/usr/lib
+-- 
+2.20.1
+
diff --git a/recipes-bsp/libmcc/libmcc_1.05.1.bb b/recipes-bsp/libmcc/libmcc_1.05.1.bb
index 8f7fd2c..da38fb0 100644
--- a/recipes-bsp/libmcc/libmcc_1.05.1.bb
+++ b/recipes-bsp/libmcc/libmcc_1.05.1.bb
@@ -8,7 +8,9 @@ DEPENDS = "virtual/kernel-module-mcc"
 
 SRC_URI = "http://repository.timesys.com/buildsources/l/libmcc/libmcc-${PV}/libmcc-${PV}.tar.bz2 \
            file://build-Fix-symlink-generation.patch \
-           file://build-with-versioned-soname.patch"
+           file://build-with-versioned-soname.patch \
+           file://0001-Makefile-use-oe-ldflags.patch \
+"
 
 SRC_URI[md5sum] = "7a35d9804bdcebdfcd7a3b717de50d31"
 SRC_URI[sha256sum] = "5d6d85f2f17ba1016c24e3a1c1c934a9267021edaed67b63879112151f48562c"
@@ -19,7 +21,7 @@ CFLAGS += "-I${STAGING_KERNEL_DIR}/include"
 
 RDEPENDS:${PN} = "virtual/kernel-module-mcc"
 
-COMPATIBLE_MACHINE = "(vf60)"
+COMPATIBLE_MACHINE = "(vf-generic-bsp)"
 
 do_install() {
     oe_runmake 'DESTDIR=${D}' install
diff --git a/recipes-bsp/mqxboot/mqxboot/0001-Makefile-use-OE-ldflags.patch b/recipes-bsp/mqxboot/mqxboot/0001-Makefile-use-OE-ldflags.patch
new file mode 100644
index 0000000..58bd372
--- /dev/null
+++ b/recipes-bsp/mqxboot/mqxboot/0001-Makefile-use-OE-ldflags.patch
@@ -0,0 +1,29 @@
+From 368ee177806f15194acf352c83f64ba697a613ac Mon Sep 17 00:00:00 2001
+From: Max Krummenacher <max.krummenacher@toradex.com>
+Date: Thu, 23 Jun 2022 08:46:14 +0000
+Subject: [PATCH] Makefile: use OE ldflags
+
+Prevents QA error about missing GNU_HASH in the binary.
+
+Upstream-Status: Pending
+Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index 37da46f..74cf280 100644
+--- a/Makefile
++++ b/Makefile
+@@ -4,7 +4,7 @@ all: build/mqxboot
+ 
+ build/mqxboot: src/mqxboot.c
+ 	mkdir -p build/
+-	$(CC) $< -o $@ $(CFLAGS)
++	$(CC) $< -o $@ $(CFLAGS) $(LDFLAGS)
+ 
+ install:
+ 	mkdir -p $(INSTALL_PATH)
+-- 
+2.20.1
+
diff --git a/recipes-bsp/mqxboot/mqxboot_1.0.1.bb b/recipes-bsp/mqxboot/mqxboot_1.0.1.bb
index f69cbcf..0303bcc 100644
--- a/recipes-bsp/mqxboot/mqxboot_1.0.1.bb
+++ b/recipes-bsp/mqxboot/mqxboot_1.0.1.bb
@@ -6,7 +6,10 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=c49712341497d0b5f2e40c30dff2af9d \
 
 DEPENDS = "virtual/kernel-module-mcc"
 
-SRC_URI = "http://repository.timesys.com/buildsources/m/mqxboot/mqxboot-${PV}/mqxboot-${PV}.tar.bz2"
+SRC_URI = " \
+    http://repository.timesys.com/buildsources/m/mqxboot/mqxboot-${PV}/mqxboot-${PV}.tar.bz2 \
+    file://0001-Makefile-use-OE-ldflags.patch \
+"
 
 SRC_URI[md5sum] = "f74755548041d50ca178448ee3e478d4"
 SRC_URI[sha256sum] = "32444409de5e809b9347e275a3bf78623a89e9ecce3188ebac79318b2b7c39b3"
@@ -17,7 +20,7 @@ CFLAGS += "-I${STAGING_KERNEL_DIR}/include"
 
 RDEPENDS:${PN} = "virtual/kernel-module-mcc"
 
-COMPATIBLE_MACHINE = "(vf60)"
+COMPATIBLE_MACHINE = "(vf-generic-bsp)"
 
 do_install() {
     oe_runmake 'DESTDIR=${D}' install
diff --git a/recipes-bsp/u-boot/u-boot-timesys_2011.12.bb b/recipes-bsp/u-boot/u-boot-timesys_2011.12.bb
deleted file mode 100644
index 4005af3..0000000
--- a/recipes-bsp/u-boot/u-boot-timesys_2011.12.bb
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright (C) 2013-2014 Timesys Corporation
-# Released under the MIT license (see COPYING.MIT for the terms)
-
-DESCRIPTION = "bootloader for Vybrid platforms"
-require recipes-bsp/u-boot/u-boot.inc
-
-PROVIDES += "u-boot"
-
-LICENSE = "GPL-2.0-or-later"
-LIC_FILES_CHKSUM = "file://COPYING;md5=1707d6db1d42237583f50183a5651ecb"
-
-SRCBRANCH = "2011.12-pcl052"
-SRC_URI = "git://github.com/Timesys/u-boot-timesys.git;protocol=https;branch=${SRCBRANCH}"
-SRCREV = "dca5026484c69628be9b9618e5795c635cefe110"
-
-SRCBRANCH_quartz = "2011.12-quartz"
-SRCREV_quartz = "2dc3859b8274b45fb6336d9713b4b07e42dfb4cb"
-
-S = "${WORKDIR}/git"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-COMPATIBLE_MACHINE = "(vf60)"
-
-PV = "v2011.12"
diff --git a/recipes-bsp/u-boot/u-boot-toradex/vf/fw_env.config b/recipes-bsp/u-boot/u-boot-toradex/vf-generic-bsp/fw_env.config
similarity index 100%
rename from recipes-bsp/u-boot/u-boot-toradex/vf/fw_env.config
rename to recipes-bsp/u-boot/u-boot-toradex/vf-generic-bsp/fw_env.config
diff --git a/recipes-kernel/kernel-module-mcc-toradex/kernel-module-mcc-toradex_1.06+toradex2.bb b/recipes-kernel/kernel-module-mcc-toradex/kernel-module-mcc-toradex_1.06+toradex2.bb
index b43f1c9..f1df335 100644
--- a/recipes-kernel/kernel-module-mcc-toradex/kernel-module-mcc-toradex_1.06+toradex2.bb
+++ b/recipes-kernel/kernel-module-mcc-toradex/kernel-module-mcc-toradex_1.06+toradex2.bb
@@ -10,6 +10,8 @@ RPROVIDES:${PN}-dev = "virtual/kernel-module-mcc-dev"
 
 inherit module
 
+export DESTDIR = "${D}"
+
 SRC_URI = "git://github.com/toradex/mcc-kmod.git;protocol=https;branch=${SRCBRANCH}"
 
 SRCBRANCH = "master"
@@ -17,4 +19,4 @@ SRCREV = "083388fa5cce79c239988d61543322d91996aa8d"
 
 S = "${WORKDIR}/git"
 
-COMPATIBLE_MACHINE = "(vf60)"
+COMPATIBLE_MACHINE = "(vf-generic-bsp)"
diff --git a/recipes-kernel/linux/linux-toradex_4.4.bb b/recipes-kernel/linux/linux-toradex_4.4.bb
index c027d7f..0f19da0 100644
--- a/recipes-kernel/linux/linux-toradex_4.4.bb
+++ b/recipes-kernel/linux/linux-toradex_4.4.bb
@@ -17,4 +17,4 @@ SRCBRANCH = "toradex_vf_4.4"
 SRCREV = "4a0abd7dd466276ee3fdf79b54f05f845f7d8844"
 
 DEPENDS += "lzop-native bc-native"
-COMPATIBLE_MACHINE = "(vf)"
+COMPATIBLE_MACHINE = "(vf-generic-bsp)"