diff --git a/imx/meta-fsl-arm/conf/machine/imx6dlsabreauto-eim-nor.conf b/imx/meta-fsl-arm/conf/machine/imx6dlsabreauto-eim-nor.conf
new file mode 100644
index 0000000000..6100056900
--- /dev/null
+++ b/imx/meta-fsl-arm/conf/machine/imx6dlsabreauto-eim-nor.conf
@@ -0,0 +1,18 @@
+#@TYPE: Machine
+#@NAME: Freescale i.MX6DL SABRE Automotive
+#@SOC: i.MX6DL
+#@DESCRIPTION: Machine configuration for Freescale i.MX6DL SABRE Automotive EIM-NOR boot
+
+include conf/machine/include/imx-base.inc
+include conf/machine/include/tune-cortexa9.inc
+include conf/machine/include/fsl-mx6-common.inc
+
+SOC_FAMILY = "mx6:mx6dl"
+
+KERNEL_DEVICETREE_mx6dlsabreauto = "${S}/arch/arm/boot/dts/imx6dl-sabreauto.dts"
+
+UBOOT_MACHINE_mx6dlsabreauto = "mx6dlsabreauto_eimnor_config"
+
+SERIAL_CONSOLE = "115200 ttymxc3"
+
+IMAGE_FSTYPES = "tar.bz2"
diff --git a/imx/meta-fsl-arm/conf/machine/imx6dlsabreauto-nand.conf b/imx/meta-fsl-arm/conf/machine/imx6dlsabreauto-nand.conf
new file mode 100644
index 0000000000..f145eb58bd
--- /dev/null
+++ b/imx/meta-fsl-arm/conf/machine/imx6dlsabreauto-nand.conf
@@ -0,0 +1,18 @@
+#@TYPE: Machine
+#@NAME: Freescale i.MX6DL SABRE Automotive
+#@SOC: i.MX6DL
+#@DESCRIPTION: Machine configuration for Freescale i.MX6DL SABRE Automotive NAND boot
+
+include conf/machine/include/imx-base.inc
+include conf/machine/include/tune-cortexa9.inc
+include conf/machine/include/fsl-mx6-common.inc
+
+SOC_FAMILY = "mx6:mx6dl"
+
+KERNEL_DEVICETREE_mx6dlsabreauto = "${S}/arch/arm/boot/dts/imx6dl-sabreauto.dts"
+
+UBOOT_MACHINE_mx6dlsabreauto = "mx6dlsabreauto_nand_config"
+
+SERIAL_CONSOLE = "115200 ttymxc3"
+
+IMAGE_FSTYPES = "tar.bz2"
diff --git a/imx/meta-fsl-arm/conf/machine/imx6dlsabreauto-spi-nor.conf b/imx/meta-fsl-arm/conf/machine/imx6dlsabreauto-spi-nor.conf
new file mode 100644
index 0000000000..7773464152
--- /dev/null
+++ b/imx/meta-fsl-arm/conf/machine/imx6dlsabreauto-spi-nor.conf
@@ -0,0 +1,18 @@
+#@TYPE: Machine
+#@NAME: Freescale i.MX6DL SABRE Automotive
+#@SOC: i.MX6DL
+#@DESCRIPTION: Machine configuration for Freescale i.MX6DL SABRE Automotive SPI-NOR boot
+
+include conf/machine/include/imx-base.inc
+include conf/machine/include/tune-cortexa9.inc
+include conf/machine/include/fsl-mx6-common.inc
+
+SOC_FAMILY = "mx6:mx6dl"
+
+KERNEL_DEVICETREE_mx6dlsabreauto = "${S}/arch/arm/boot/dts/imx6dl-sabreauto.dts"
+
+UBOOT_MACHINE_mx6dlsabreauto = "mx6dlsabreauto_spinor_config"
+
+SERIAL_CONSOLE = "115200 ttymxc3"
+
+IMAGE_FSTYPES = ""
diff --git a/imx/meta-fsl-arm/conf/machine/imx6qsabreauto-eim-nor.conf b/imx/meta-fsl-arm/conf/machine/imx6qsabreauto-eim-nor.conf
new file mode 100644
index 0000000000..8e8acb5b71
--- /dev/null
+++ b/imx/meta-fsl-arm/conf/machine/imx6qsabreauto-eim-nor.conf
@@ -0,0 +1,18 @@
+#@TYPE: Machine
+#@NAME: Freescale i.MX6Q SABRE Automotive
+#@SOC: i.MX6Q
+#@DESCRIPTION: Machine configuration for Freescale i.MX6Q SABRE Automotive EIM-NOR boot
+
+include conf/machine/include/imx-base.inc
+include conf/machine/include/tune-cortexa9.inc
+include conf/machine/include/fsl-mx6-common.inc
+
+SOC_FAMILY = "mx6:mx6q"
+
+KERNEL_DEVICETREE = "${S}/arch/arm/boot/dts/imx6q-sabreauto.dts"
+
+UBOOT_MACHINE = "mx6qsabreauto_eimnor_config"
+
+SERIAL_CONSOLE = "115200 ttymxc3"
+
+IMAGE_FSTYPES = "tar.bz2"
diff --git a/imx/meta-fsl-arm/conf/machine/imx6qsabreauto-nand.conf b/imx/meta-fsl-arm/conf/machine/imx6qsabreauto-nand.conf
new file mode 100644
index 0000000000..4b5cca6a8f
--- /dev/null
+++ b/imx/meta-fsl-arm/conf/machine/imx6qsabreauto-nand.conf
@@ -0,0 +1,18 @@
+#@TYPE: Machine
+#@NAME: Freescale i.MX6Q SABRE Automotive
+#@SOC: i.MX6Q
+#@DESCRIPTION: Machine configuration for Freescale i.MX6Q SABRE Automotive NAND boot
+
+include conf/machine/include/imx-base.inc
+include conf/machine/include/tune-cortexa9.inc
+include conf/machine/include/fsl-mx6-common.inc
+
+SOC_FAMILY = "mx6:mx6q"
+
+KERNEL_DEVICETREE = "${S}/arch/arm/boot/dts/imx6q-sabreauto.dts"
+
+UBOOT_MACHINE = "mx6qsabreauto_nand_config"
+
+SERIAL_CONSOLE = "115200 ttymxc3"
+
+IMAGE_FSTYPES = "tar.bz2"
diff --git a/imx/meta-fsl-arm/conf/machine/imx6qsabreauto-spi-nor.conf b/imx/meta-fsl-arm/conf/machine/imx6qsabreauto-spi-nor.conf
new file mode 100644
index 0000000000..5ddcea31f8
--- /dev/null
+++ b/imx/meta-fsl-arm/conf/machine/imx6qsabreauto-spi-nor.conf
@@ -0,0 +1,18 @@
+#@TYPE: Machine
+#@NAME: Freescale i.MX6Q SABRE Automotive
+#@SOC: i.MX6Q
+#@DESCRIPTION: Machine configuration for Freescale i.MX6Q SABRE Automotive SPI-NOR boot
+
+include conf/machine/include/imx-base.inc
+include conf/machine/include/tune-cortexa9.inc
+include conf/machine/include/fsl-mx6-common.inc
+
+SOC_FAMILY = "mx6:mx6q"
+
+KERNEL_DEVICETREE = "${S}/arch/arm/boot/dts/imx6q-sabreauto.dts"
+
+UBOOT_MACHINE = "mx6qsabreauto_spinor_config"
+
+SERIAL_CONSOLE = "115200 ttymxc3"
+
+IMAGE_FSTYPES = ""
diff --git a/imx/meta-fsl-arm/conf/machine/imx6qsabresd-sata.conf b/imx/meta-fsl-arm/conf/machine/imx6qsabresd-sata.conf
new file mode 100644
index 0000000000..15c9b247f0
--- /dev/null
+++ b/imx/meta-fsl-arm/conf/machine/imx6qsabresd-sata.conf
@@ -0,0 +1,18 @@
+#@TYPE: Machine
+#@NAME: Freescale i.MX6Q SABRE Smart Device
+#@SOC: i.MX6Q
+#@DESCRIPTION: Machine configuration for Freescale i.MX6Q SABRE Smart Device SATA boot
+
+include conf/machine/include/imx-base.inc
+include conf/machine/include/tune-cortexa9.inc
+include conf/machine/include/fsl-mx6-common.inc
+
+SOC_FAMILY = "mx6:mx6q"
+
+KERNEL_DEVICETREE = "${S}/arch/arm/boot/dts/imx6q-sabresd.dts"
+
+UBOOT_MACHINE = "mx6qsabresd_sata_config"
+
+SERIAL_CONSOLE = "115200 ttymxc0"
+
+IMAGE_FSTYPES = "tar.bz2"
diff --git a/imx/meta-fsl-arm/conf/machine/imx6solosabreauto-eim-nor.conf b/imx/meta-fsl-arm/conf/machine/imx6solosabreauto-eim-nor.conf
new file mode 100644
index 0000000000..aef6e114c5
--- /dev/null
+++ b/imx/meta-fsl-arm/conf/machine/imx6solosabreauto-eim-nor.conf
@@ -0,0 +1,18 @@
+#@TYPE: Machine
+#@NAME: Freescale i.MX6Solo SABRE Automotive
+#@SOC: i.MX6S
+#@DESCRIPTION: Machine configuration for Freescale i.MX6Solo SABRE Automotive EIM-NOR boot
+
+include conf/machine/include/imx-base.inc
+include conf/machine/include/tune-cortexa9.inc
+include conf/machine/include/fsl-mx6-common.inc
+
+SOC_FAMILY = "mx6:mx6s"
+
+KERNEL_DEVICETREE = "${S}/arch/arm/boot/dts/imx6dl-sabreauto.dts"
+
+UBOOT_MACHINE = " mx6solosabreauto_eimnor_config"
+
+IMAGE_FSTYPES = "tar.bz2"
+
+SERIAL_CONSOLE = "115200 ttymxc3"
diff --git a/imx/meta-fsl-arm/conf/machine/imx6solosabreauto-nand.conf b/imx/meta-fsl-arm/conf/machine/imx6solosabreauto-nand.conf
new file mode 100644
index 0000000000..ddfe698e8e
--- /dev/null
+++ b/imx/meta-fsl-arm/conf/machine/imx6solosabreauto-nand.conf
@@ -0,0 +1,18 @@
+#@TYPE: Machine
+#@NAME: Freescale i.MX6Solo SABRE Automotive
+#@SOC: i.MX6S
+#@DESCRIPTION: Machine configuration for Freescale i.MX6Solo SABRE Automotive NAND boot
+
+include conf/machine/include/imx-base.inc
+include conf/machine/include/tune-cortexa9.inc
+include conf/machine/include/fsl-mx6-common.inc
+
+SOC_FAMILY = "mx6:mx6s"
+
+KERNEL_DEVICETREE = "${S}/arch/arm/boot/dts/imx6dl-sabreauto.dts"
+
+UBOOT_MACHINE = " mx6solosabreauto_nand_config"
+
+SERIAL_CONSOLE = "115200 ttymxc3"
+
+IMAGE_FSTYPES = "tar.bz2"
diff --git a/imx/meta-fsl-arm/conf/machine/imx6solosabreauto-spi-nor.conf b/imx/meta-fsl-arm/conf/machine/imx6solosabreauto-spi-nor.conf
new file mode 100644
index 0000000000..0b212dde91
--- /dev/null
+++ b/imx/meta-fsl-arm/conf/machine/imx6solosabreauto-spi-nor.conf
@@ -0,0 +1,18 @@
+#@TYPE: Machine
+#@NAME: Freescale i.MX6Solo SABRE Automotive
+#@SOC: i.MX6S
+#@DESCRIPTION: Machine configuration for Freescale i.MX6Solo SABRE Automotive SPI-NOR boot
+
+include conf/machine/include/imx-base.inc
+include conf/machine/include/tune-cortexa9.inc
+include conf/machine/include/fsl-mx6-common.inc
+
+SOC_FAMILY = "mx6:mx6s"
+
+KERNEL_DEVICETREE = "${S}/arch/arm/boot/dts/imx6dl-sabreauto.dts"
+
+UBOOT_MACHINE = " mx6solosabreauto_spinor_config"
+
+SERIAL_CONSOLE = "115200 ttymxc3"
+
+IMAGE_FSTYPES = ""
diff --git a/imx/meta-fsl-arm/conf/machine/include/fsl-mx6-common.inc b/imx/meta-fsl-arm/conf/machine/include/fsl-mx6-common.inc
new file mode 100644
index 0000000000..d9641a7684
--- /dev/null
+++ b/imx/meta-fsl-arm/conf/machine/include/fsl-mx6-common.inc
@@ -0,0 +1,10 @@
+# Provides the i.MX mx6 Freescale board common settings
+
+# set to hardware floating point
+DEFAULTTUNE_mx6 ?= "cortexa9hf-neon"
+
+## Note the imx-base appends vpu firmware so not including it here
+## Note sdma firmware from firmware-imx is not needed on mx6
+MACHINE_FIRMWARE = " linux-firmware-ath6k"
+
+MACHINE_FEATURES += " pci wifi bluetooth"