machines: Re-added old MACHINEOVERRIDES

NXP removed the old MACHINEOVERRIDES (mx6, mx8m, ...) and filters
them out during the Yocto build.
We rely on them quite often in our recipes and therefore disabled
the filter for now.

conf/machine/imx6guf.conf

@@ -6,7 +6,7 @@
 require include/seconorth-machine.inc
 require conf/machine/include/arm/armv7a/tune-cortexa9.inc
 
-MACHINEOVERRIDES =. "imxipu:imxvpu:imxgpu2d:imxgpu3d:"
+MACHINEOVERRIDES =. "imxipu:imxvpu:imxgpu2d:imxgpu3d:mx6:"
 SOC_FAMILY = "imx:mx6:mx6q"
 
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS += " \

conf/machine/imx6ullguf.conf

@@ -6,7 +6,7 @@
 require include/seconorth-machine.inc
 require conf/machine/include/arm/armv7a/tune-cortexa7.inc
 
-MACHINEOVERRIDES =. "imxpxp:"
+MACHINEOVERRIDES =. "imxpxp:mx6:mx6ull:"
 SOC_FAMILY = "imx:mx6:mx6ull"
 
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS += " \

conf/machine/include/seconorth-machine.inc

@@ -7,6 +7,13 @@ KERNEL_IMAGETYPE = "uImage"
 KBUILD_BUILD_USER := "support"
 KBUILD_BUILD_HOST := "seco.com"
 
+# The MACHINEOVERRIDES_EXTENDER_FILTER_OUT is the filter that removes
+# the old machine overrides for the NXP SoCs (e.g. mx6 or mx8m).
+# Since we use these overrides frequently and the new overrides are
+# quite long (mx8m-generic-bsp, etc.) we keep them for now.
+# For more info see meta-freescale/conf/machine/include/imx-base.inc.
+MACHINEOVERRIDES_EXTENDER_FILTER_OUT = " "
+
 MACHINE_EXTRA_RRECOMMENDS:append = " \
     gfxml2dto \
     kernel-modules \