diff --git a/recipes-bsp/u-boot/u-boot-toradex/mx6-nxp-bsp/fw_env.config b/recipes-bsp/u-boot/u-boot-toradex/mx6-generic-bsp/fw_env.config
similarity index 100%
rename from recipes-bsp/u-boot/u-boot-toradex/mx6-nxp-bsp/fw_env.config
rename to recipes-bsp/u-boot/u-boot-toradex/mx6-generic-bsp/fw_env.config
diff --git a/recipes-bsp/u-boot/u-boot-toradex_2020.07.bb b/recipes-bsp/u-boot/u-boot-toradex_2020.07.bb
index 2a82973..19683ef 100644
--- a/recipes-bsp/u-boot/u-boot-toradex_2020.07.bb
+++ b/recipes-bsp/u-boot/u-boot-toradex_2020.07.bb
@@ -54,4 +54,4 @@ do_compile:append:colibri-vf () {
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-COMPATIBLE_MACHINE = "(mx6-nxp-bsp|mx7-nxp-bsp|vf-generic-bsp|use-mainline-bsp)"
+COMPATIBLE_MACHINE = "(mx6-generic-bsp|mx7-generic-bsp|vf-generic-bsp)"