diff --git a/meta-digi-arm/conf/machine/ccimx6adpt.conf b/meta-digi-arm/conf/machine/ccimx6adpt.conf
new file mode 100644
index 000000000..ebb37dea7
--- /dev/null
+++ b/meta-digi-arm/conf/machine/ccimx6adpt.conf
@@ -0,0 +1,10 @@
+#@TYPE: Machine
+#@NAME: ConnectCore 6 JumpStart Kit.
+#@DESCRIPTION: Machine configuration for Digi's ConnectCore 6 JSK.
+
+# Contains the ConnectCore 6 module.
+include conf/machine/include/ccimx6.inc
+
+KERNEL_DEVICETREE = "imx6-${MACHINE}.dtb imx6-${MACHINE}-ldo.dtb imx6-${MACHINE}-hdcp.dtb"
+
+SERIAL_CONSOLES = "115200;ttymxc0"
diff --git a/meta-digi-arm/conf/machine/include/ccimx51.inc b/meta-digi-arm/conf/machine/include/ccimx51.inc
index f0b29a385..29b7884ef 100644
--- a/meta-digi-arm/conf/machine/include/ccimx51.inc
+++ b/meta-digi-arm/conf/machine/include/ccimx51.inc
@@ -3,6 +3,7 @@
 #@DESCRIPTION: Machine configuration for Digi's ConnectCore for MX51 module.
 
 include conf/machine/include/imx-digi-base.inc
+include conf/machine/include/tune-cortexa8.inc
 
 SOC_FAMILY = "mx5:mx51"
 
diff --git a/meta-digi-arm/conf/machine/include/ccimx53.inc b/meta-digi-arm/conf/machine/include/ccimx53.inc
index ce36c1cfe..267cffcd4 100644
--- a/meta-digi-arm/conf/machine/include/ccimx53.inc
+++ b/meta-digi-arm/conf/machine/include/ccimx53.inc
@@ -3,6 +3,7 @@
 #@DESCRIPTION: Machine configuration for Digi's ConnectCore for MX53 module.
 
 include conf/machine/include/imx-digi-base.inc
+include conf/machine/include/tune-cortexa8.inc
 
 SOC_FAMILY = "mx5:mx53"
 
diff --git a/meta-digi-arm/conf/machine/include/ccimx6.inc b/meta-digi-arm/conf/machine/include/ccimx6.inc
new file mode 100644
index 000000000..cd4204f4b
--- /dev/null
+++ b/meta-digi-arm/conf/machine/include/ccimx6.inc
@@ -0,0 +1,36 @@
+#@TYPE: Machine
+#@NAME: ConnectCore 6 module.
+#@DESCRIPTION: Machine configuration for Digi's ConnectCore 6 module.
+
+include conf/machine/include/imx-digi-base.inc
+include conf/machine/include/tune-cortexa9.inc
+
+SOC_FAMILY = "mx6:mx6q"
+
+# Platform u-boot settings
+UBOOT_ENTRYPOINT = "0x10800000"
+UBOOT_SUFFIX = "imx"
+
+# Firmware
+MACHINE_FIRMWARE ?= ""
+MACHINE_FIRMWARE_append = " firmware-imx-vpu-imx6q"
+
+MACHINE_EXTRA_RRECOMMENDS += "${MACHINE_FIRMWARE}"
+MACHINE_EXTRA_RRECOMMENDS += "fsl-alsa-plugins"
+
+#
+# Supported variants
+#
+# To build any of these variants configure MACHINE_VARIANT on the project's
+# local.conf to the variant name.
+#
+# Name          WiFi
+# ------------------
+# -             N       (empty MACHINE_VARIANT="")
+# w             Y
+
+# All variants support
+MACHINE_FEATURES += "accel-graphics accel-video"
+
+# Per-variant machine features
+MACHINE_FEATURES_append_w = " wifi"
diff --git a/meta-digi-arm/conf/machine/include/digi-defaults.inc b/meta-digi-arm/conf/machine/include/digi-defaults.inc
index 79b5063a3..085c58741 100644
--- a/meta-digi-arm/conf/machine/include/digi-defaults.inc
+++ b/meta-digi-arm/conf/machine/include/digi-defaults.inc
@@ -7,7 +7,9 @@ PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
 
 # Digi BSP default versions
 PREFERRED_VERSION_linux-dey ?= "2.6.35.14"
+PREFERRED_VERSION_linux-dey_mx6 ?= "3.10"
 PREFERRED_VERSION_u-boot-dey ?= "2009.08"
+PREFERRED_VERSION_u-boot-dey_mx6 ?= "2013.04"
 
 # Help variables used in recipes
 HAVE_WIFI    = "${@base_contains('MACHINE_FEATURES', 'wifi', '1', '', d)}"
diff --git a/meta-digi-arm/conf/machine/include/imx-digi-base.inc b/meta-digi-arm/conf/machine/include/imx-digi-base.inc
index 57dc667e3..6477bc43e 100644
--- a/meta-digi-arm/conf/machine/include/imx-digi-base.inc
+++ b/meta-digi-arm/conf/machine/include/imx-digi-base.inc
@@ -1,21 +1,27 @@
 # Digi's i.MX platforms common settings
 include conf/machine/include/digi-defaults.inc
 include conf/machine/include/soc-family.inc
-include conf/machine/include/tune-cortexa8.inc
 
 # Disable perf features as 2.6.35.3 fail to build otherwise
 PERF_FEATURES_ENABLE = ""
 
+XSERVER_DRIVER = "xf86-video-fbdev"
+XSERVER_DRIVER_mx5 = "xf86-video-imxfb"
+XSERVER_DRIVER_mx6 = "xf86-video-imxfb-vivante"
 XSERVER = "xserver-xorg \
            xf86-input-evdev \
-           xf86-video-imxfb"
+           ${XSERVER_DRIVER}"
 
 # Ship kernel modules
 MACHINE_EXTRA_RRECOMMENDS = "kernel-modules"
 
+# Float-Point setting
+DEFAULTTUNE_mx6 ?= "cortexa9hf-neon"
+
 # Sub-architecture support
 MACHINE_SOCARCH ?= ""
 MACHINE_SOCARCH_mx5 = "${TUNE_PKGARCH}-mx5"
+MACHINE_SOCARCH_mx6 = "${TUNE_PKGARCH}-mx6"
 PACKAGE_EXTRA_ARCHS_append = " ${MACHINE_SOCARCH}"
 
 MACHINE_ARCH_FILTER = "virtual/kernel"
@@ -27,17 +33,27 @@ INHERIT += "fsl-dynamic-packagearch"
 # Gstreamer plugin
 MACHINE_GSTREAMER_PLUGIN ?= "gst-fsl-plugin"
 
-# MX5 GPU libraries
+# mx5 GPU libraries
 GPU_FLAVOUR = "${@base_contains('DISTRO_FEATURES', 'x11', 'x11-', '', d)}"
 PREFERRED_PROVIDER_virtual/egl_mx5      ?= "amd-gpu-${GPU_FLAVOUR}bin-mx51"
 PREFERRED_PROVIDER_virtual/libgles1_mx5 ?= "amd-gpu-${GPU_FLAVOUR}bin-mx51"
 PREFERRED_PROVIDER_virtual/libgles2_mx5 ?= "amd-gpu-${GPU_FLAVOUR}bin-mx51"
 
+# mx6 GPU libraries
+PREFERRED_PROVIDER_virtual/egl_mx6 ?= "gpu-viv-bin-mx6q"
+PREFERRED_PROVIDER_virtual/libgl_mx6 ?= "gpu-viv-bin-mx6q"
+PREFERRED_PROVIDER_virtual/libgles1_mx6 ?= "gpu-viv-bin-mx6q"
+PREFERRED_PROVIDER_virtual/libgles2_mx6 ?= "gpu-viv-bin-mx6q"
+
 EXTRA_IMAGEDEPENDS = "u-boot"
 
 # Flash image types
 IMAGE_FSTYPES ?= "sum.jffs2 tar.bz2 ubifs"
 
+# MX6 does not have flash memory so build sdcard images
+SDCARD_ROOTFS_mx6 ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext4"
+IMAGE_FSTYPES_mx6 ?= "ext4 sdcard tar.bz2"
+
 KERNEL_IMAGETYPE = "uImage"
 
 MACHINE_FEATURES = "apm usbgadget usbhost vfat alsa touchscreen"