diff --git a/meta-digi-arm/conf/machine/ccardxmx28js.conf b/meta-digi-arm/conf/machine/ccardxmx28js.conf
index 89ab84234..49e596c37 100644
--- a/meta-digi-arm/conf/machine/ccardxmx28js.conf
+++ b/meta-digi-arm/conf/machine/ccardxmx28js.conf
@@ -8,7 +8,7 @@ IMXBOOTLETS_MACHINE = "CCARDXMX28JS"
 
 UBOOT_ENTRYPOINT = "0x41008000"
 UBOOT_LOADADDRESS = "0x41008000"
-UBOOT_MACHINE = "ccardxmx28js_config"
+UBOOT_MACHINE = "ccardwmx28js_config"
 UBOOT_MAKE_TARGET = "u-boot.sb"
 UBOOT_SUFFIX = "sb"
 
@@ -17,10 +17,7 @@ KERNEL_IMAGETYPE = "uImage"
 # 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"
+SERIAL_CONSOLE = "115200 ttyAM0"
 
 KERNEL_IMAGETYPE = "uImage"
 
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 5ceb452ad..ec952f1dd 100644
--- a/meta-digi-arm/conf/machine/include/imx-digi-base.inc
+++ b/meta-digi-arm/conf/machine/include/imx-digi-base.inc
@@ -1,7 +1,7 @@
-# Provides the i.MX architecture common settings
+# Provides the i.MXC architecture common settings
 include conf/machine/include/imx-base.inc
 
-# Overrides the default fsl settings
+# Overrides the default FSL settings
 
 # Single override file for settings, versions and providers.
 include conf/machine/include/digi-defaults.inc
diff --git a/meta-digi-arm/conf/machine/include/mxs-digi-base.inc b/meta-digi-arm/conf/machine/include/mxs-digi-base.inc
index cab205bf8..5a4d68065 100644
--- a/meta-digi-arm/conf/machine/include/mxs-digi-base.inc
+++ b/meta-digi-arm/conf/machine/include/mxs-digi-base.inc
@@ -1,6 +1,25 @@
-# Provides the i.MXS common settings
+# Provides the i.MXS architecture common settings
 include conf/machine/include/mxs-base.inc
 
-# Override default fsl settings.
+# Overrides the default FSL settings
 
+# Single override file for settings, versions and providers.
 include conf/machine/include/digi-defaults.inc
+
+# Flash image types
+SDCARD_ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3"
+
+# [TODO] add SDCARD support
+# At the moment it's failing due to wrong u-boot image
+IMAGE_FSTYPES ?= "tar.bz2"
+IMAGE_FSTYPES += "sum.jffs2 ubifs"
+
+# Sector size 128 KiB
+JFFS2_ERASEBLOCK = "0x20000"
+
+# Use the common short option for 'mkfs.jffs2' and 'sumtool'
+JFFS2_ENDIANNESS = "-l"
+EXTRA_IMAGECMD_sum.jffs2 = "${EXTRA_IMAGECMD_jffs2}"
+
+# mkfs.ubifs parameters
+MKUBIFS_ARGS = "-m 2048 -e 126976 -c 2047"