diff --git a/meta-digi-arm/conf/machine/ccimx6ulstarter.conf b/meta-digi-arm/conf/machine/ccimx6ulstarter.conf
new file mode 100644
index 000000000..31804f96e
--- /dev/null
+++ b/meta-digi-arm/conf/machine/ccimx6ulstarter.conf
@@ -0,0 +1,39 @@
+#@TYPE: Machine
+#@NAME: ConnectCore 6 Single Board Computer.
+#@DESCRIPTION: Machine configuration for Digi's ConnectCore 6 SBC.
+
+# Contains the ConnectCore 6 module.
+include conf/machine/include/ccimx6.inc
+
+# U-Boot configurations
+# Last one is the default (the one the symlinks point at)
+UBOOT_CONFIG ??= "ccimx6dlsbc512MB ccimx6dlsbc ccimx6qsbc2GB ccimx6qsbc512MB ccimx6qsbc"
+UBOOT_CONFIG[ccimx6dlsbc512MB] = "ccimx6dlsbc512MB_defconfig"
+UBOOT_CONFIG[ccimx6dlsbc] = "ccimx6dlsbc_defconfig"
+UBOOT_CONFIG[ccimx6qsbc2GB] = "ccimx6qsbc2GB_defconfig"
+UBOOT_CONFIG[ccimx6qsbc512MB] = "ccimx6qsbc512MB_defconfig"
+UBOOT_CONFIG[ccimx6qsbc] = "ccimx6qsbc_defconfig"
+
+KERNEL_DEVICETREE ?= " \
+    imx6dl-ccimx6sbc.dtb \
+    imx6dl-ccimx6sbc-w.dtb \
+    imx6dl-ccimx6sbc-wb.dtb \
+    imx6q-ccimx6sbc.dtb \
+    imx6q-ccimx6sbc-w.dtb \
+    imx6q-ccimx6sbc-wb.dtb \
+    imx6q-ccimx6sbc-wb-ldo-bypass.dtb \
+    imx6q-ccimx6sbc-id129.dtb \
+    imx6q-ccimx6sbc-id130.dtb \
+    imx6dl-ccimx6sbc-id131.dtb \
+"
+
+SERIAL_CONSOLES = "115200;ttymxc3"
+
+# Bluetooth tty
+BT_TTY ?= "ttymxc1"
+
+# U-Boot script to be copied to the boot image
+BOOT_SCRIPTS = "boot.scr:boot.scr"
+
+# Flash image types
+IMAGE_FSTYPES ?= "boot.vfat ext4 sdcard tar.bz2"
diff --git a/meta-digi-arm/conf/machine/include/ccimx6ul.inc b/meta-digi-arm/conf/machine/include/ccimx6ul.inc
new file mode 100644
index 000000000..b5a22f3aa
--- /dev/null
+++ b/meta-digi-arm/conf/machine/include/ccimx6ul.inc
@@ -0,0 +1,35 @@
+#@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
+
+DIGI_FAMILY = "ccimx6"
+SOC_FAMILY  = "mx6:mx6dl:mx6q:${DIGI_FAMILY}"
+
+# Platform u-boot settings
+UBOOT_ENTRYPOINT = "0x10800000"
+UBOOT_SUFFIX = "imx"
+UBOOT_SYMLINK = "u-boot-${MACHINE}.${UBOOT_SUFFIX}"
+
+# Wireless external module
+WIRELESS_MODULE ?= ""
+
+# Firmware
+MACHINE_FIRMWARE ?= ""
+MACHINE_FIRMWARE_append_mx6q = " firmware-imx-vpu-imx6q"
+MACHINE_FIRMWARE_append_mx6dl = " firmware-imx-vpu-imx6d"
+MACHINE_FIRMWARE_append = " ${@base_conditional('HAVE_BT', '1' , 'firmware-atheros-ar3k', '', d)}"
+MACHINE_FIRMWARE_append = " ${@base_conditional('HAVE_WIFI', '1' , 'firmware-atheros-ath6kl', '', d)}"
+
+MACHINE_EXTRA_RDEPENDS += " \
+    e2fsprogs-mke2fs \
+    e2fsprogs-resize2fs \
+    parted \
+    u-boot-fw-utils \
+"
+MACHINE_EXTRA_RRECOMMENDS += "${MACHINE_FIRMWARE} ${WIRELESS_MODULE}"
+MACHINE_EXTRA_RRECOMMENDS += "fsl-alsa-plugins"
+
+MACHINE_FEATURES += "accel-graphics accel-video wifi bluetooth"