2 files changed, 4 insertions, 10 deletions
diff --git a/meta-boot2qt-distro/conf/distro/include/fsl.inc b/meta-boot2qt-distro/conf/distro/include/fsl.inc
index b922515f..b4980f45 100644
--- a/meta-boot2qt-distro/conf/distro/include/fsl.inc
+++ b/meta-boot2qt-distro/conf/distro/include/fsl.inc
@@ -41,10 +41,6 @@ DEPLOY_CONF_NAME:imx8qpx-mek = "NXP i.MX 8QuadXPlus MEK"
 
 IMAGE_FSTYPES += "wic.xz"
 
-IMX_DEFAULT_BSP = "nxp"
-IMX_DEFAULT_BOOTLOADER ?= "u-boot-imx"
-IMX_DEFAULT_KERNEL:b2qt = "linux-imx"
-
 DEPLOY_CONF_IMAGE_TYPE = "wic.xz"
 
 QBSP_IMAGE_CONTENT += "\
@@ -65,3 +61,7 @@ PREFERRED_VERSION_gstreamer1.0-libav:use-nxp-bsp        ?= "1.20.0"
 PREFERRED_VERSION_gstreamer1.0-rtsp-server:use-nxp-bsp  ?= "1.20.0"
 
 MACHINE_GSTREAMER_1_0_PLUGIN:append:imxgpu = " imx-gst1.0-plugin"
+
+GPULESS_FEATURES = "wayland opengl vulkan webengine"
+DISTRO_FEATURES:remove:mx6ul-generic-bsp = "${GPULESS_FEATURES}"
+DISTRO_FEATURES:remove:mx7-generic-bsp = "${GPULESS_FEATURES}"
diff --git a/meta-boot2qt-distro/conf/distro/include/toradex.inc b/meta-boot2qt-distro/conf/distro/include/toradex.inc
index a7dd0504..61f1e354 100644
--- a/meta-boot2qt-distro/conf/distro/include/toradex.inc
+++ b/meta-boot2qt-distro/conf/distro/include/toradex.inc
@@ -32,8 +32,6 @@ include conf/distro/include/fsl.inc
 # include file from meta-toradex-nxp
 include conf/machine/include/${MACHINE}.inc
 
-PREFERRED_PROVIDER_virtual/dtb:use-nxp-bsp = "device-tree-overlays"
-
 IMAGE_CLASSES += "image_type_tezi_b2qt"
 
 QBSP_IMAGE_CONTENT += "\
@@ -57,10 +55,6 @@ DEPLOY_CONF_NAME:colibri-imx8x = "Toradex Colibri iMX8X"
 DEPLOY_CONF_NAME:verdin-imx8mm = "Toradex Verdin iMX8M Mini"
 DEPLOY_CONF_NAME:verdin-imx8mp = "Toradex Verdin iMX8M Plus"
 
-GPULESS_FEATURES = "wayland opengl vulkan webengine"
-GPULESS_FEATURES:imxgpu = ""
-DISTRO_FEATURES:remove = "${GPULESS_FEATURES}"
-
 # Suitable DRI device
 DRI_DEVICE:apalis-imx6 = "card1"
 DRI_DEVICE:colibri-imx6 = "card1"