diff --git a/meta-digi-arm/conf/machine/ccardxmx28js.conf b/meta-digi-arm/conf/machine/ccardxmx28js.conf
new file mode 100644
index 000000000..4361ac209
--- /dev/null
+++ b/meta-digi-arm/conf/machine/ccardxmx28js.conf
@@ -0,0 +1,27 @@
+#@TYPE: Machine
+#@NAME: ConnectCore for MX28 JumpStart Kit.
+#@DESCRIPTION: Machine configuration for Digi's ConnectCore for MX28 JSK. 
+
+include conf/machine/include/mxs-base.inc
+
+IMXBOOTLETS_MACHINE = "CCARDXMX28JS"
+
+UBOOT_ENTRYPOINT = "0x41008000"
+UBOOT_LOADADDRESS = "0x41008000"
+UBOOT_MACHINE = "ccardxmx28js_config"
+UBOOT_MAKE_TARGET = "u-boot.sb"
+UBOOT_SUFFIX = "sb"
+
+KERNEL_IMAGETYPE = "uImage"
+
+# [DIGI] Digi's kernel does not use device tree.
+# KERNEL_DEVICETREE = "${S}/arch/arm/boot/dts/ccardxmx28js.dts"
+
+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"
diff --git a/meta-digi-arm/conf/machine/ccxmx51js.conf b/meta-digi-arm/conf/machine/ccxmx51js.conf
new file mode 100644
index 000000000..c46a9f758
--- /dev/null
+++ b/meta-digi-arm/conf/machine/ccxmx51js.conf
@@ -0,0 +1,17 @@
+#@TYPE: Machine
+#@NAME: ConnectCore for MX51 JumpStart Kit.
+#@DESCRIPTION: Machine configuration for Digi's ConnectCore for MX51 JSK
+
+include conf/machine/include/imx-base.inc
+include conf/machine/include/tune-cortexa8.inc
+
+SOC_FAMILY = "mx51:mx5"
+
+# [DIGI] Dig's kernel does not use device trees.
+# KERNEL_DEVICETREE = "${S}/arch/arm/boot/dts/ccxmx51js.dts"
+
+UBOOT_MACHINE = "ccxmx51_config"
+
+# [DIGI] Wireless firmware file need to be addded here
+# MACHINE_FIRMWARE += " firmware-imx-ath6k"
+MACHINE_FEATURES += " wifi"
\ No newline at end of file
diff --git a/meta-digi-arm/conf/machine/ccxmx53js.conf b/meta-digi-arm/conf/machine/ccxmx53js.conf
new file mode 100644
index 000000000..4d928dda5
--- /dev/null
+++ b/meta-digi-arm/conf/machine/ccxmx53js.conf
@@ -0,0 +1,17 @@
+#@TYPE: Machine
+#@NAME: ConnectCore for MX53 JumpStart Kit.
+#@DESCRIPTION: Machine configuration for Digi's ConnectCore for MX53 JSK.
+
+include conf/machine/include/imx-base.inc
+include conf/machine/include/tune-cortexa8.inc
+
+SOC_FAMILY = "mx53:mx5"
+
+# [DIGI] Digi's kernel does not use device tree.
+# KERNEL_DEVICETREE = "${S}/arch/arm/boot/dts/imx53-qsb.dts"
+
+UBOOT_MACHINE = "ccxmx53js_config"
+
+# [DIGI] Wireless firmware file need to be addded here
+# MACHINE_FIRMWARE += " firmware-imx-ath6k"
+MACHINE_FEATURES += " wifi"
diff --git a/meta-digi-arm/conf/machine/include/digi-defaults.inc b/meta-digi-arm/conf/machine/include/digi-defaults.inc
new file mode 100644
index 000000000..961d7034e
--- /dev/null
+++ b/meta-digi-arm/conf/machine/include/digi-defaults.inc
@@ -0,0 +1,14 @@
+# Digi BSP default providers
+
+PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-digi-2.6.35"
+PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-imx"
+PREFERRED_PROVIDER_u-boot ?= "u-boot-digi"
+
+# Digi BSP default settings
+
+IMAGE_CLASSES += "image_types_digi"
+
+# Digi BSP default versions
+
+PREFERRED_VERSION_udev = "173"
diff --git a/meta-digi-arm/conf/machine/include/imx-base.inc b/meta-digi-arm/conf/machine/include/imx-base.inc
new file mode 100644
index 000000000..d4eba44b5
--- /dev/null
+++ b/meta-digi-arm/conf/machine/include/imx-base.inc
@@ -0,0 +1,63 @@
+# Provides the i.MX architecture common settings
+
+include conf/machine/include/digi-defaults.inc
+include conf/machine/include/soc-family.inc
+
+# [DIGI] [TODO] Don't think we need this.
+# Disable perf features as 2.6.35.3 fail to build otherwise
+# PERF_FEATURES_ENABLE = ""
+
+# [DIGI] TODO need to understand this.
+# Set specific make target and binary suffix
+UBOOT_MAKE_TARGET = "u-boot.imx"
+UBOOT_SUFFIX = "imx"
+
+UBOOT_ENTRYPOINT_mx51  = "0xa0000000"
+UBOOT_LOADADDRESS_mx51 = "0xa0000000"
+
+UBOOT_ENTRYPOINT_mx53  = "0x70800000"
+UBOOT_LOADADDRESS_mx53 = "0x70800000"
+
+# [DIGI] Work in progress
+# UBOOT_ENTRYPOINT_mx6  = "0x10800000"
+# UBOOT_LOADADDRESS_mx6 = "0x10800000"
+
+XSERVER_DRIVER = "xf86-video-fbdev"
+XSERVER_DRIVER_mx5 = "xf86-video-imxfb"
+XSERVER = "xserver-xorg \
+           xf86-input-evdev \
+           ${XSERVER_DRIVER}"
+
+# Ship kernel modules
+MACHINE_EXTRA_RRECOMMENDS = "kernel-modules"
+
+# Firmware
+MACHINE_FIRMWARE ?= ""
+MACHINE_FIRMWARE_mx53 = "firmware-imx-vpu-imx53 firmware-imx-sdma-imx53"
+MACHINE_FIRMWARE_mx51 = "firmware-imx-vpu-imx51 firmware-imx-sdma-imx51"
+
+MACHINE_EXTRA_RRECOMMENDS += "${MACHINE_FIRMWARE}"
+
+# Extra audio support
+MACHINE_EXTRA_RRECOMMENDS += "imx-audio \
+                              imx-lib \
+                              udev-extraconf"
+
+# Gstreamer plugin
+MACHINE_GSTREAMER_PLUGIN ?= "gst-fsl-plugin"
+
+# [DIGI] TODO This may be amd-gpu-bin-mx51
+PREFERRED_PROVIDER_virtual/egl_mx5 ?= "amd-gpu-x11-bin-mx51"
+PREFERRED_PROVIDER_virtual/libgles1_mx5 ?= "amd-gpu-x11-bin-mx51"
+PREFERRED_PROVIDER_virtual/libgles2_mx5 ?= "amd-gpu-x11-bin-mx51"
+
+EXTRA_IMAGEDEPENDS = "u-boot"
+
+SDCARD_ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3"
+IMAGE_FSTYPES ?= "tar.bz2 ext3 sdcard"
+
+SERIAL_CONSOLE = "115200 ttymxc0"
+
+KERNEL_IMAGETYPE = "uImage"
+
+MACHINE_FEATURES = "apm usbgadget usbhost vfat alsa touchscreen"
diff --git a/meta-digi-arm/conf/machine/include/mxs-base.inc b/meta-digi-arm/conf/machine/include/mxs-base.inc
new file mode 100644
index 000000000..46d5a6694
--- /dev/null
+++ b/meta-digi-arm/conf/machine/include/mxs-base.inc
@@ -0,0 +1,20 @@
+# Provides the i.MXS common settings
+
+include conf/machine/include/digi-defaults.inc
+include conf/machine/include/soc-family.inc
+include conf/machine/include/tune-arm926ejs.inc
+
+SOC_FAMILY = "mxs"
+
+# [DIGI] This may not be needed
+# Disable perf features as 2.6.35.3 fail to build otherwise
+# PERF_FEATURES_ENABLE = ""
+
+XSERVER = "xserver-xorg \
+           xf86-input-evdev \
+           xf86-video-fbdev"
+
+# Ship kernel modules
+MACHINE_EXTRA_RRECOMMENDS = "kernel-modules"
+
+SERIAL_CONSOLE = "115200 ttyAMA0"