initial commit for Enea Linux 4.0-140929daisy-140929

Migrated from the internal git server on the daisy-enea-point-release branch

Signed-off-by: Tudor Florea <tudor.florea@enea.com>

28 files changed, 501 insertions, 0 deletions

diff --git a/conf/layer.conf b/conf/layer.conf
new file mode 100644
index 0000000..f581bac
--- /dev/null
+++ b/conf/layer.conf
@@ -0,0 +1,12 @@
+# We have a conf and classes directory, add to BBPATH
+BBPATH .= ":${LAYERDIR}"
+
+# We have a packages directory, add to BBFILES
+BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
+            ${LAYERDIR}/recipes-*/*/*.bbappend"
+
+BBFILE_COLLECTIONS += "fsl-arm-extra"
+BBFILE_PATTERN_fsl-arm-extra := "^${LAYERDIR}/"
+BBFILE_PRIORITY_fsl-arm-extra = "4"
+
+LAYERDEPENDS_fsl-arm-extra = "core fsl-arm"
diff --git a/conf/machine/cfa10036.conf b/conf/machine/cfa10036.conf
new file mode 100644
index 0000000..c3dc461
--- /dev/null
+++ b/conf/machine/cfa10036.conf
@@ -0,0 +1,7 @@
+#@TYPE: Machine
+#@NAME: Crystalfontz CFA-10036
+#@SOC: i.MX28
+#@DESCRIPTION: Machine configuration for CFA-10036
+#@MAINTAINER: Alexandre Belloni <alexandre.belloni@free-electrons.com>
+
+include conf/machine/include/cfa10036.inc
diff --git a/conf/machine/cfa10037.conf b/conf/machine/cfa10037.conf
new file mode 100644
index 0000000..c453ac5
--- /dev/null
+++ b/conf/machine/cfa10037.conf
@@ -0,0 +1,10 @@
+#@TYPE: Machine
+#@NAME: Crystalfontz CFA-10037
+#@SOC: i.MX28
+#@DESCRIPTION: Machine configuration for CFA-10037
+#@MAINTAINER: Alexandre Belloni <alexandre.belloni@free-electrons.com>
+
+include conf/machine/include/cfa10036.inc
+
+KERNEL_DEVICETREE += "imx28-cfa10037.dtb"
+
diff --git a/conf/machine/cfa10049.conf b/conf/machine/cfa10049.conf
new file mode 100644
index 0000000..7beee20
--- /dev/null
+++ b/conf/machine/cfa10049.conf
@@ -0,0 +1,12 @@
+#@TYPE: Machine
+#@NAME: Crystalfontz CFA-10049
+#@SOC: i.MX28
+#@DESCRIPTION: Machine configuration for CFA-10049
+#@MAINTAINER: Alexandre Belloni <alexandre.belloni@free-electrons.com>
+
+include conf/machine/include/cfa10036.inc
+
+KERNEL_DEVICETREE += "imx28-cfa10049.dtb"
+
+MACHINE_FEATURES += "touchscreen"
+
diff --git a/conf/machine/cfa10055.conf b/conf/machine/cfa10055.conf
new file mode 100644
index 0000000..8aa3d5b
--- /dev/null
+++ b/conf/machine/cfa10055.conf
@@ -0,0 +1,12 @@
+#@TYPE: Machine
+#@NAME: Crystalfontz CFA-10055
+#@SOC: i.MX28
+#@DESCRIPTION: Machine configuration for CFA-10055
+#@MAINTAINER: Alexandre Belloni <alexandre.belloni@free-electrons.com>
+
+include conf/machine/include/cfa10036.inc
+
+KERNEL_DEVICETREE += "imx28-cfa10055.dtb"
+
+MACHINE_FEATURES += "touchscreen"
+
diff --git a/conf/machine/cfa10056.conf b/conf/machine/cfa10056.conf
new file mode 100644
index 0000000..5988db8
--- /dev/null
+++ b/conf/machine/cfa10056.conf
@@ -0,0 +1,12 @@
+#@TYPE: Machine
+#@NAME: Crystalfontz CFA-10056
+#@SOC: i.MX28
+#@DESCRIPTION: Machine configuration for CFA-10056
+#@MAINTAINER: Alexandre Belloni <alexandre.belloni@free-electrons.com>
+
+include conf/machine/include/cfa10036.inc
+
+KERNEL_DEVICETREE += "imx28-cfa10056.dtb"
+
+MACHINE_FEATURES += "screen"
+
diff --git a/conf/machine/cfa10057.conf b/conf/machine/cfa10057.conf
new file mode 100644
index 0000000..f7b8694
--- /dev/null
+++ b/conf/machine/cfa10057.conf
@@ -0,0 +1,12 @@
+#@TYPE: Machine
+#@NAME: Crystalfontz CFA-10057
+#@SOC: i.MX28
+#@DESCRIPTION: Machine configuration for CFA-10057, also called CFA-920
+#@MAINTAINER: Alexandre Belloni <alexandre.belloni@free-electrons.com>
+
+include conf/machine/include/cfa10036.inc
+
+KERNEL_DEVICETREE += "imx28-cfa10057.dtb"
+
+MACHINE_FEATURES += "touchscreen"
+
diff --git a/conf/machine/cfa10058.conf b/conf/machine/cfa10058.conf
new file mode 100644
index 0000000..0a89805
--- /dev/null
+++ b/conf/machine/cfa10058.conf
@@ -0,0 +1,12 @@
+#@TYPE: Machine
+#@NAME: Crystalfontz CFA-10058
+#@SOC: i.MX28
+#@DESCRIPTION: Machine configuration for CFA-10058, also called CFA-921
+#@MAINTAINER: Alexandre Belloni <alexandre.belloni@free-electrons.com>
+
+include conf/machine/include/cfa10036.inc
+
+KERNEL_DEVICETREE += "imx28-cfa10058.dtb"
+
+MACHINE_FEATURES += "touchscreen"
+
diff --git a/conf/machine/cgtqmx6.conf b/conf/machine/cgtqmx6.conf
new file mode 100644
index 0000000..467379a
--- /dev/null
+++ b/conf/machine/cgtqmx6.conf
@@ -0,0 +1,23 @@
+#@TYPE: Machine
+#@NAME: Congatec Qmx6
+#@SOC: i.MX6Q
+#@DESCRIPTION: Machine configuration for Congatec Qmx6 board
+
+include conf/machine/include/imx-base.inc
+include conf/machine/include/tune-cortexa9.inc
+
+SOC_FAMILY = "mx6:mx6q"
+
+# Use u-boot imx
+UBOOT_SUFFIX = "bin"
+UBOOT_PADDING = "2"
+PREFERRED_PROVIDER_u-boot = "u-boot-imx"
+PREFERRED_VERSION_u-boot-imx = "2009.08"
+
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-congatec"
+
+UBOOT_MACHINE = "cgtqmx6_config"
+
+SERIAL_CONSOLE = "115200 ttymxc1"
+
+MACHINE_FEATURES += " pci"
diff --git a/conf/machine/cubox-i.conf b/conf/machine/cubox-i.conf
new file mode 100644
index 0000000..99416c1
--- /dev/null
+++ b/conf/machine/cubox-i.conf
@@ -0,0 +1,33 @@
+#@TYPE: Machine
+#@NAME: SolidRun CuBox-i
+#@SOC: i.MX6 Q/DL
+#@DESCRIPTION: Machine configuration for SolidRun CuBox-i and HummingBoard machines
+#@MAINTAINER: Carlos Rafael Giani <dv@pseudoterminal.org>
+
+# Machine config for the SolidRun CuBox-i and HummingBoard machines.
+# They all use the same machine config, since the u-boot SPL autodetects the
+# machine type upon booting. SOC_FAMILY includes all SoCs from all of these machines
+# to let recipes include firmware etc. for all of these SoCs.
+
+require conf/machine/include/imx-base.inc
+require conf/machine/include/tune-cortexa9.inc
+
+SOC_FAMILY = "mx6:mx6dl:mx6q"
+
+PREFERRED_PROVIDER_u-boot = "u-boot-cubox-i"
+PREFERRED_PROVIDER_virtual/kernel = "linux-cubox-i"
+
+UBOOT_MAKE_TARGET = ""
+UBOOT_SUFFIX = "img"
+UBOOT_ENTRYPOINT = "0x10800000"
+UBOOT_CONFIG ??= "sd"
+UBOOT_CONFIG[sd] = "mx6_cubox-i_config,sdcard"
+UENV_FILENAME = "uEnv-${MACHINE}.txt"
+SPL_BINARY = "SPL"
+
+BOOT_SCRIPTS = "${UENV_FILENAME}:uEnv.txt"
+
+MACHINE_FEATURES += "pci wifi bluetooth alsa bluetooth irda serial usbhost wifi"
+MACHINE_FIRMWARE_append_mx6 = " linux-firmware-ath6k"
+
+SERIAL_CONSOLE = "115200 ttymxc0"
diff --git a/conf/machine/imx233-olinuxino-maxi.conf b/conf/machine/imx233-olinuxino-maxi.conf
new file mode 100644
index 0000000..9f9d42c
--- /dev/null
+++ b/conf/machine/imx233-olinuxino-maxi.conf
@@ -0,0 +1,8 @@
+#@TYPE: Machine
+#@NAME: OLIMEX iMX233-OLinuXino-Maxi
+#@SOC: i.MX23
+#@DESCRIPTION: Machine configuration for OLIMEX iMX233-OLinuXino-Maxi
+
+include conf/machine/include/imx233-olinuxino.inc
+
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "net-persistent-mac"
diff --git a/conf/machine/imx233-olinuxino-micro.conf b/conf/machine/imx233-olinuxino-micro.conf
new file mode 100644
index 0000000..01677cc
--- /dev/null
+++ b/conf/machine/imx233-olinuxino-micro.conf
@@ -0,0 +1,6 @@
+#@TYPE: Machine
+#@NAME: OLIMEX iMX233-OLinuXino-Micro
+#@SOC: i.MX23
+#@DESCRIPTION: Machine configuration for OLIMEX iMX233-OLinuXino-Micro
+
+include conf/machine/include/imx233-olinuxino.inc
diff --git a/conf/machine/imx233-olinuxino-mini.conf b/conf/machine/imx233-olinuxino-mini.conf
new file mode 100644
index 0000000..ad06263
--- /dev/null
+++ b/conf/machine/imx233-olinuxino-mini.conf
@@ -0,0 +1,6 @@
+#@TYPE: Machine
+#@NAME: OLIMEX iMX233-OLinuXino-Mini
+#@SOC: i.MX23
+#@DESCRIPTION: Machine configuration for OLIMEX iMX233-OLinuXino-Mini
+
+include conf/machine/include/imx233-olinuxino.inc
diff --git a/conf/machine/imx233-olinuxino-nano.conf b/conf/machine/imx233-olinuxino-nano.conf
new file mode 100644
index 0000000..0627899
--- /dev/null
+++ b/conf/machine/imx233-olinuxino-nano.conf
@@ -0,0 +1,6 @@
+#@TYPE: Machine
+#@NAME: OLIMEX iMX233-OLinuXino-Nano
+#@SOC: i.MX23
+#@DESCRIPTION: Machine configuration for OLIMEX iMX233-OLinuXino-Nano
+
+include conf/machine/include/imx233-olinuxino.inc
diff --git a/conf/machine/imx6qsabrelite.conf b/conf/machine/imx6qsabrelite.conf
new file mode 100644
index 0000000..c6bd735
--- /dev/null
+++ b/conf/machine/imx6qsabrelite.conf
@@ -0,0 +1,13 @@
+#@TYPE: Machine
+#@NAME: Boundary Devices i.MX6Q SABRE Lite
+#@SOC: i.MX6Q
+#@DESCRIPTION: Machine configuration for Boundary Devices i.MX6Q SABRE Lite
+#@MAINTAINER: Eric Nelson <eric.nelson@boundarydevices.com>
+
+# WARNING: This board now use the *same* code as Nitrogen6X and it
+#          boots from internal SPI NOR memory. If you did change it to boot
+#          from the MMC (SD3 or SD4) please check the Boundary's blog post
+#          at: http://boundarydevices.com/u-boot-on-i-mx6/#unbricking
+
+MACHINEOVERRIDES = "nitrogen6x:${MACHINE}"
+include conf/machine/nitrogen6x.conf
diff --git a/conf/machine/include/cfa10036.inc b/conf/machine/include/cfa10036.inc
new file mode 100644
index 0000000..535b07c
--- /dev/null
+++ b/conf/machine/include/cfa10036.inc
@@ -0,0 +1,29 @@
+# Common definitions for cfa-10036 boards
+
+include conf/machine/include/mxs-base.inc
+
+SOC_FAMILY = "mxs:mx28:cfa10036"
+
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-cfa"
+
+IMAGE_BOOTLOADER = "barebox"
+BAREBOX_BINARY = "barebox"
+
+IMXBOOTLETS_MACHINE = "cfa10036"
+
+KERNEL_IMAGETYPE = "zImage"
+KERNEL_DEVICETREE = "imx28-cfa10036.dtb"
+
+# we need the kernel to be installed in the final image
+IMAGE_INSTALL_append = " kernel-image kernel-devicetree"
+
+SDCARD_ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3"
+IMAGE_FSTYPES ?= "tar.bz2 ext3 barebox.mxsboot-sdcard sdcard"
+
+SERIAL_CONSOLE = "115200 ttyAMA0"
+
+MACHINE_FEATURES = "usbgadget usbhost vfat"
+
+# Overrides due use of non-FSL kernel
+PREFERRED_VERSION_imx-test = "00.00.00"
+MACHINE_GSTREAMER_PLUGIN_cfa10036 = ""
diff --git a/conf/machine/include/imx233-olinuxino.inc b/conf/machine/include/imx233-olinuxino.inc
new file mode 100644
index 0000000..c0b400b
--- /dev/null
+++ b/conf/machine/include/imx233-olinuxino.inc
@@ -0,0 +1,17 @@
+# Common definitions to all iMX233-OlinuXino variants
+
+include conf/machine/include/mxs-base.inc
+
+IMXBOOTLETS_MACHINE = "stmp378x_dev"
+UBOOT_MACHINE = "mx23_olinuxino_config"
+
+# Add a override for all iMX233-OLinuXino variants
+SOC_FAMILY = "mxs:mx23:imx233-olinuxino"
+
+KERNEL_IMAGETYPE = "uImage"
+KERNEL_DEVICETREE = "imx23-olinuxino.dtb"
+
+SDCARD_ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3"
+IMAGE_FSTYPES ?= "tar.bz2 ext3 uboot.mxsboot-sdcard sdcard"
+
+MACHINE_FEATURES = "apm usbgadget usbhost vfat alsa"
diff --git a/conf/machine/include/wandboard.inc b/conf/machine/include/wandboard.inc
new file mode 100644
index 0000000..d8a0348
--- /dev/null
+++ b/conf/machine/include/wandboard.inc
@@ -0,0 +1,13 @@
+# Common settings for wandboard boards
+
+include conf/machine/include/imx-base.inc
+include conf/machine/include/tune-cortexa9.inc
+
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-wandboard"
+PREFERRED_VERSION_linux-wandboard ?= "3.10.17"
+
+SERIAL_CONSOLE = "115200 ttymxc0"
+
+MACHINE_FEATURES += "pci touchscreen"
+
+KERNEL_IMAGETYPE = "zImage"
diff --git a/conf/machine/m28evk.conf b/conf/machine/m28evk.conf
new file mode 100644
index 0000000..014be18
--- /dev/null
+++ b/conf/machine/m28evk.conf
@@ -0,0 +1,27 @@
+#@TYPE: Machine
+#@NAME: DENX M28 SoM Evaluation Kit
+#@SOC: i.MX28
+#@DESCRIPTION: Machine configuration for DENX M28 SoM Evaluation Kit
+
+include conf/machine/include/mxs-base.inc
+
+SOC_FAMILY = "mxs:mx28"
+
+UBOOT_MACHINE = "m28evk_config"
+
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-fslc"
+KERNEL_IMAGETYPE = "uImage"
+KERNEL_DEVICETREE = "imx28-m28evk.dtb"
+
+SDCARD_ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3"
+IMAGE_FSTYPES ?= "tar.bz2 ext3 uboot.mxsboot-sdcard sdcard"
+
+SERIAL_CONSOLE = "115200 ttyAMA0"
+
+KERNEL_IMAGETYPE = "uImage"
+
+MACHINE_FEATURES = "apm usbgadget usbhost vfat alsa touchscreen"
+
+# Overrides due use of non-FSL kernel
+PREFERRED_VERSION_imx-test = "00.00.00"
+MACHINE_GSTREAMER_PLUGIN_m28evk = ""
diff --git a/conf/machine/m53evk.conf b/conf/machine/m53evk.conf
new file mode 100644
index 0000000..e49a157
--- /dev/null
+++ b/conf/machine/m53evk.conf
@@ -0,0 +1,28 @@
+#@TYPE: Machine
+#@NAME: DENX M53 SoM Evaluation Kit
+#@SOC: i.MX53
+#@DESCRIPTION: Machine configuration for DENX M53 SoM Evaluation Kit
+
+include conf/machine/include/imx-base.inc
+include conf/machine/include/tune-cortexa8.inc
+
+SOC_FAMILY = "mx5:mx53"
+
+UBOOT_MACHINE = "m53evk_config"
+
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-denx"
+
+KERNEL_IMAGETYPE = "uImage"
+KERNEL_DEVICETREE = "imx53-m53evk.dtb"
+
+SDCARD_ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3"
+IMAGE_FSTYPES ?= "tar.bz2 ext3 sdcard"
+
+SERIAL_CONSOLE = "115200 ttymxc1"
+
+MACHINE_FEATURES = "apm usbgadget usbhost vfat alsa touchscreen"
+
+# Overrides due use of non-FSL kernel
+PREFERRED_VERSION_imx-test = "00.00.00"
+MACHINE_GSTREAMER_PLUGIN_m53evk = ""
+XSERVER_DRIVER_m53evk = "xf86-video-fbdev"
diff --git a/conf/machine/nitrogen6x-lite.conf b/conf/machine/nitrogen6x-lite.conf
new file mode 100644
index 0000000..de98f39
--- /dev/null
+++ b/conf/machine/nitrogen6x-lite.conf
@@ -0,0 +1,32 @@
+#@TYPE: Machine
+#@NAME: Boundary Devices Nitrogen6X Lite
+#@SOC: i.MX6 Solo
+#@DESCRIPTION: Machine configuration for Boundary Devices Nitrogen6X Lite
+#@MAINTAINER: Eric Nelson <eric.nelson@boundarydevices.com>
+
+include conf/machine/include/imx-base.inc
+include conf/machine/include/tune-cortexa9.inc
+
+SOC_FAMILY = "mx6:mx6dl"
+
+KERNEL_DEVICETREE = "imx6dl-nit6xlite.dtb"
+
+PREFERRED_PROVIDER_u-boot = "u-boot-boundary"
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-boundary"
+PREFERRED_VERSION_linux-boundary ?= "3.10.17"
+
+# Use SPI NOR U-Boot by default
+IMAGE_BOOTLOADER ?= ""
+
+# Ensure boot scripts will be available at rootfs time
+do_rootfs[depends] += "u-boot-script-boundary:do_deploy"
+
+# Boot scripts to install
+BOOT_SCRIPTS = "6x_bootscript-${MACHINE}:6x_bootscript"
+
+UBOOT_MACHINE ?= "nit6xlite_config"
+
+SERIAL_CONSOLE = "115200 ttymxc1"
+
+MACHINE_EXTRA_RRECOMMENDS += " broadcom-nvram-config"
+MACHINE_FEATURES += " pci wifi bluetooth"
diff --git a/conf/machine/nitrogen6x.conf b/conf/machine/nitrogen6x.conf
new file mode 100644
index 0000000..bd18995
--- /dev/null
+++ b/conf/machine/nitrogen6x.conf
@@ -0,0 +1,57 @@
+#@TYPE: Machine
+#@NAME: Boundary Devices Nitrogen6X
+#@SOC: i.MX6Q
+#@DESCRIPTION: Machine configuration for Boundary Devices Nitrogen6X
+#@MAINTAINER: Eric Nelson <eric.nelson@boundarydevices.com>
+#
+# Note that this machine configuration also supports the SABRE Lite
+# reference design and the Nitrogen6X-SOM.
+#
+# By default, this machine will build for the standard Quad-Core, 1GB
+# option.
+#
+# To build U-Boot for other CPU or memory combinations, you can set
+# the UBOOT_MACHINE variable in your local.conf according to the
+# following table:
+#
+# Processor           Memory    Configuration
+# --------------      ------    --------------------
+# i.MX6Quad/Dual        1GB     nitrogen6q_config
+# i.MX6Quad/Dual        2GB     nitrogen6q2g_config
+# i.MX6Dual-Lite        1GB     nitrogen6dl_config
+# i.MX6Dual-Lite        2GB     nitrogen6dl2g_config
+# i.MX6Solo           512MB     nitrogen6s_config
+# i.MX6Solo             1GB     nitrogen6s1g_config
+#
+# See this blog post for details:
+#    http://boundarydevices.com/u-boot-updates-for-i-mx6-single
+#
+#
+
+include conf/machine/include/imx-base.inc
+include conf/machine/include/tune-cortexa9.inc
+
+SOC_FAMILY = "mx6:mx6dl:mx6q"
+
+KERNEL_DEVICETREE = "imx6q-sabrelite.dtb imx6q-nitrogen6x.dtb imx6dl-nitrogen6x.dtb"
+
+PREFERRED_PROVIDER_u-boot = "u-boot-boundary"
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-boundary"
+PREFERRED_VERSION_linux-boundary ?= "3.10.17"
+
+# Use SPI NOR U-Boot by default
+IMAGE_BOOTLOADER ?= ""
+
+# Ensure boot scripts will be available at rootfs time
+do_rootfs[depends] += "u-boot-script-boundary:do_deploy"
+
+# Boot scripts to install
+BOOT_SCRIPTS = "6x_bootscript-${MACHINE}:6x_bootscript"
+
+UBOOT_MACHINE ?= "nitrogen6q_config"
+
+SERIAL_CONSOLE = "115200 ttymxc1"
+
+MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-wl12xx"
+
+MACHINE_FEATURES += " pci wifi bluetooth"
diff --git a/conf/machine/pcl052.conf b/conf/machine/pcl052.conf
new file mode 100644
index 0000000..611e93d
--- /dev/null
+++ b/conf/machine/pcl052.conf
@@ -0,0 +1,22 @@
+#@TYPE: Machine
+#@NAME: Phytec Cosmic Vybrid Development Kit
+#@SOC: vf60
+#@DESCRIPTION: Machine configuration for Phytec Cosmic Vybrid Development Kit
+#@MAINTAINER: Anthony Felice <tony.felice@timesys.com>
+
+include conf/machine/include/imx-base.inc
+include conf/machine/include/tune-cortexa5.inc
+
+SOC_FAMILY = "vf60"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux-timesys"
+PREFERRED_PROVIDER_u-boot = "u-boot-timesys"
+
+UBOOT_MACHINE = "pcl052_config"
+
+SDCARD_ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3"
+IMAGE_FSTYPES ?= "tar.bz2 ext3 sdcard"
+
+SERIAL_CONSOLE = "115200 ttymxc1"
+
+MACHINE_FEATURES = "apm usbgadget usbhost vfat alsa"
diff --git a/conf/machine/pcm052.conf b/conf/machine/pcm052.conf
new file mode 100644
index 0000000..d86fdb0
--- /dev/null
+++ b/conf/machine/pcm052.conf
@@ -0,0 +1,22 @@
+#@TYPE: Machine
+#@NAME: Phytec phyCORE Vybrid Development Kit
+#@SOC: vf60
+#@DESCRIPTION: Machine configuration for Phytec phyCORE Vybrid Development Kit
+#@MAINTAINER: Anthony Felice <tony.felice@timesys.com>
+
+include conf/machine/include/imx-base.inc
+include conf/machine/include/tune-cortexa5.inc
+
+SOC_FAMILY = "vf60"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux-timesys"
+PREFERRED_PROVIDER_u-boot = "u-boot-timesys"
+
+UBOOT_MACHINE = "pcm052_config"
+
+SDCARD_ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3"
+IMAGE_FSTYPES ?= "tar.bz2 ext3 sdcard"
+
+SERIAL_CONSOLE = "115200 ttymxc1"
+
+MACHINE_FEATURES = "apm usbgadget usbhost vfat alsa touchscreen"
diff --git a/conf/machine/quartz.conf b/conf/machine/quartz.conf
new file mode 100644
index 0000000..55bd47a
--- /dev/null
+++ b/conf/machine/quartz.conf
@@ -0,0 +1,23 @@
+#@TYPE: Machine
+#@NAME: Device Solutions Quartz Vybrid Development Kit
+#@SOC: vf60
+#@DESCRIPTION: Machine configuration for Device Solutions Quartz Vybrid Development Kit
+#@MAINTAINER: Anthony Felice <tony.felice@timesys.com>
+
+include conf/machine/include/imx-base.inc
+include conf/machine/include/tune-cortexa5.inc
+
+SOC_FAMILY = "vf60"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux-timesys"
+PREFERRED_PROVIDER_u-boot = "u-boot-timesys"
+
+# The quartz_nand_config target supports both SD and NAND boot.
+UBOOT_MACHINE = "quartz_nand_config"
+
+SDCARD_ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3"
+IMAGE_FSTYPES ?= "tar.bz2 ext3 sdcard"
+
+SERIAL_CONSOLE = "115200 ttymxc0"
+
+MACHINE_FEATURES = "apm usbgadget usbhost vfat alsa touchscreen"
diff --git a/conf/machine/wandboard-dual.conf b/conf/machine/wandboard-dual.conf
new file mode 100644
index 0000000..4f81a2f
--- /dev/null
+++ b/conf/machine/wandboard-dual.conf
@@ -0,0 +1,17 @@
+#@TYPE: Machine
+#@NAME: Wandboard i.MX6 Wandboard Duallite
+#@SOC: i.MX6DL
+#@DESCRIPTION: Machine configuration for i.MX6 Wandboard Duallite
+#@MAINTAINER: John Weber <rjohnweber@gmail.com>
+
+include include/wandboard.inc
+
+SOC_FAMILY = "mx6:mx6dl:wandboard"
+
+UBOOT_MACHINE = "wandboard_dl_config"
+
+KERNEL_DEVICETREE = "imx6dl-wandboard.dtb"
+
+MACHINE_FEATURES += "bluetooth wifi"
+
+MACHINE_EXTRA_RRECOMMENDS += " broadcom-nvram-config"
diff --git a/conf/machine/wandboard-quad.conf b/conf/machine/wandboard-quad.conf
new file mode 100644
index 0000000..133f907
--- /dev/null
+++ b/conf/machine/wandboard-quad.conf
@@ -0,0 +1,17 @@
+#@TYPE: Machine
+#@NAME: Wandboard i.MX6 Wandboard Quad
+#@SOC: i.MX6Q
+#@DESCRIPTION: Machine configuration for i.MX6 Wandboard Quad
+#@MAINTAINER: John Weber <rjohnweber@gmail.com>
+
+include include/wandboard.inc
+
+SOC_FAMILY = "mx6:mx6q:wandboard"
+
+UBOOT_MACHINE = "wandboard_quad_config"
+
+KERNEL_DEVICETREE = "imx6q-wandboard.dtb"
+
+MACHINE_FEATURES += "bluetooth wifi"
+
+MACHINE_EXTRA_RRECOMMENDS += " broadcom-nvram-config"
diff --git a/conf/machine/wandboard-solo.conf b/conf/machine/wandboard-solo.conf
new file mode 100644
index 0000000..c2780bf
--- /dev/null
+++ b/conf/machine/wandboard-solo.conf
@@ -0,0 +1,13 @@
+#@TYPE: Machine
+#@NAME: Wandboard i.MX6 Wandboard Solo
+#@SOC: i.MX6S
+#@DESCRIPTION: Machine configuration for i.MX6 Wandboard Solo
+#@MAINTAINER: John Weber <rjohnweber@gmail.com>
+
+include include/wandboard.inc
+
+SOC_FAMILY = "mx6:mx6dl:wandboard"
+
+UBOOT_MACHINE = "wandboard_solo_config"
+
+KERNEL_DEVICETREE = "imx6dl-wandboard.dtb"