5 files changed, 5 insertions, 0 deletions
diff --git a/conf/machine/include/apalis-imx6.inc b/conf/machine/include/apalis-imx6.inc
index c2ae376..71f44c7 100644
--- a/conf/machine/include/apalis-imx6.inc
+++ b/conf/machine/include/apalis-imx6.inc
@@ -27,6 +27,7 @@ UBOOT_DTB_LOADADDRESS_apalis-imx6 = "0x12100000"
 UBOOT_DTBO_LOADADDRESS_apalis-imx6 = "0x17000000"
 
 MACHINE_FIRMWARE_remove = "firmware-imx-epdc"
+MACHINE_FIRMWARE_remove_use-mainline-bsp = "firmware-imx-vpu-imx6q firmware-imx-vpu-imx6d"
 
 TEZI_EXTERNAL_KERNEL_DEVICETREE_BOOT = "apalis-imx6_hdmi_overlay.dtbo"
 TEZI_EXTERNAL_KERNEL_DEVICETREE_BOOT_use-mainline-bsp = "apalis-imx6_parallel-rgb_overlay.dtbo display-edt7_overlay.dtbo apalis-imx6_stmpe-ts_overlay.dtbo apalis-imx6_hdmi_overlay.dtbo"
diff --git a/conf/machine/include/colibri-imx6.inc b/conf/machine/include/colibri-imx6.inc
index 1c11dc0..e77550a 100644
--- a/conf/machine/include/colibri-imx6.inc
+++ b/conf/machine/include/colibri-imx6.inc
@@ -25,6 +25,7 @@ PREFERRED_PROVIDER_u-boot-default-script = "u-boot-distro-boot"
 UBOOT_SUFFIX = "img"
 
 MACHINE_FIRMWARE_remove = "firmware-imx-epdc"
+MACHINE_FIRMWARE_remove_use-mainline-bsp = "firmware-imx-vpu-imx6q firmware-imx-vpu-imx6d"
 
 UBOOT_ENTRYPOINT_colibri-imx6 = "0x11000000"
 UBOOT_DTB_LOADADDRESS_colibri-imx6 = "0x12100000"
diff --git a/conf/machine/include/colibri-imx6ull.inc b/conf/machine/include/colibri-imx6ull.inc
index 106fc88..84af376 100644
--- a/conf/machine/include/colibri-imx6ull.inc
+++ b/conf/machine/include/colibri-imx6ull.inc
@@ -15,6 +15,7 @@ PREFERRED_PROVIDER_u-boot-default-script = "u-boot-distro-boot"
 UBOOT_ENTRYPOINT_colibri-imx6ull = "0x81000000"
 
 MACHINEOVERRIDES_append_upstream = ":use-mainline-bsp"
+MACHINE_FIRMWARE_remove_use-mainline-bsp = "firmware-imx-vpu-imx6q firmware-imx-vpu-imx6d"
 
 UBOOT_MAKE_TARGET_colibri-imx6ull = "u-boot.imx"
 UBOOT_ENTRYPOINT_colibri-imx6ull = "0x81000000"
diff --git a/conf/machine/include/colibri-imx7-emmc.inc b/conf/machine/include/colibri-imx7-emmc.inc
index 8f3d2b2..dd67ea8 100644
--- a/conf/machine/include/colibri-imx7-emmc.inc
+++ b/conf/machine/include/colibri-imx7-emmc.inc
@@ -10,6 +10,7 @@ MACHINE_NAME = "Colibri-iMX7-eMMC"
 MACHINEOVERRIDES_append_upstream = ":use-mainline-bsp"
 
 MACHINE_FIRMWARE_remove = "firmware-imx-epdc"
+MACHINE_FIRMWARE_remove_use-mainline-bsp = "firmware-imx-vpu-imx6q firmware-imx-vpu-imx6d"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-toradex"
 PREFERRED_PROVIDER_virtual/kernel_preempt-rt = "linux-toradex"
diff --git a/conf/machine/include/colibri-imx7.inc b/conf/machine/include/colibri-imx7.inc
index 2e6f24d..4cc2d59 100644
--- a/conf/machine/include/colibri-imx7.inc
+++ b/conf/machine/include/colibri-imx7.inc
@@ -11,6 +11,7 @@ MACHINE_NAME = "Colibri-iMX7"
 MACHINEOVERRIDES_append_upstream = ":use-mainline-bsp"
 
 MACHINE_FIRMWARE_remove = "firmware-imx-epdc"
+MACHINE_FIRMWARE_remove_use-mainline-bsp = "firmware-imx-vpu-imx6q firmware-imx-vpu-imx6d"
 
 KERNEL_DEVICETREE_append_use-nxp-bsp += " \
     imx7d-colibri-iris.dtb \