diff --git a/conf/layer.conf b/conf/layer.conf
index 7ca4ef3..3f52793 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -5,11 +5,11 @@ BBPATH .= ":${LAYERDIR}"
 BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
             ${LAYERDIR}/recipes-*/*/*.bbappend"
 
-BBFILE_COLLECTIONS += "smarcimx8m"
-BBFILE_PATTERN_smarcimx8m := "^${LAYERDIR}/"
-BBFILE_PRIORITY_smarcimx8m = "12"
+BBFILE_COLLECTIONS += "smarcimx8mm"
+BBFILE_PATTERN_smarcimx8mm := "^${LAYERDIR}/"
+BBFILE_PRIORITY_smarcimx8mm = "12"
 
-LAYERSERIES_COMPAT_smarcimx8m = "sumo"
+LAYERSERIES_COMPAT_smarcimx8mm = "sumo"
 
 LICENSE_PATH += "${LAYERDIR}/licenses"
 
diff --git a/conf/machine/smarcimx8mm2g.conf b/conf/machine/smarcimx8mm2g.conf
new file mode 100644
index 0000000..ca5a859
--- /dev/null
+++ b/conf/machine/smarcimx8mm2g.conf
@@ -0,0 +1,86 @@
+#@TYPE: Machine
+#@NAME: EMBEDIAN SMARC-iMX8MM COMPUTER ON MODULES with 2GB LPDDR4 MEMORY
+#@SOC: i.MX8MM
+#@DESCRIPTION: Machine configuration for Embedian SMARC-iMX8MM
+#@MAINTAINER: Eric Lee <eric.lee@embedian.com>
+#
+# http://www.www.embedian.com
+
+MACHINEOVERRIDES =. "mx8:mx8m:mx8mm:"
+require conf/machine/include/imx-base.inc
+require conf/machine/include/arm/arch-arm64.inc
+
+MACHINE_FEATURES += " usbgadget vfat ext2 alsa serial pci wifi bluetooth"
+
+IMAGE_FEATURES += "package-management"
+
+# Embedian BSP default providers
+PREFERRED_PROVIDER_virtual/kernel_smarcimx8mm2g ?= "linux-smarcimx8mm"
+PREFERRED_VERSION_linux-smarcimx8mm2g_smarcimx8mm2g = "4.14.98"
+
+KERNEL_DEVICETREE = " \
+        embedian/fsl-smarcimx8mm.dtb \
+"
+IMAGE_BOOTFILES_DEPENDS += "imx-m4-demos:do_deploy"
+IMAGE_BOOTFILES += "imx8mm_m4_TCM_hello_world.bin imx8mm_m4_TCM_rpmsg_lite_pingpong_rtos_linux_remote.bin imx8mm_m4_TCM_rpmsg_lite_str_echo_rtos.bin"
+
+PREFERRED_PROVIDER_u-boot_smarcimx8mm2g = "u-boot-smarcimx8mm"
+PREFERRED_PROVIDER_virtual/bootloader_smarcimx8mm2g = "u-boot-smarcimx8mm"
+
+UBOOT_CONFIG ??= "sd"
+UBOOT_CONFIG[sd] = "smarcimx8mm_2g_ser3_defconfig,sdcard"
+SPL_BINARY = "spl/u-boot-spl.bin"
+
+# Set DDR FIRMWARE
+DDR_FIRMWARE_NAME = "lpddr4_pmu_train_1d_imem.bin lpddr4_pmu_train_1d_dmem.bin lpddr4_pmu_train_2d_imem.bin lpddr4_pmu_train_2d_dmem.bin"
+
+# Set U-Boot DTB
+UBOOT_DTB_NAME = "fsl-smarcimx8mm.dtb"
+
+# Set imx-mkimage boot target
+IMXBOOT_TARGETS = "flash_evk"
+
+SERIAL_CONSOLE = "115200 ttymxc1"
+
+IMAGE_BOOTLOADER = "imx-boot"
+
+BOOT_SPACE = "65536"
+
+LOADADDR = ""
+UBOOT_SUFFIX = "bin"
+UBOOT_MAKE_TARGET = ""
+IMX_BOOT_SEEK = "33"
+
+PREFERRED_RPROVIDER_ptpd = "ptpd"
+PREFERRED_RPROVIDER_ptpd-dev = "ptpd"
+
+MACHINE_EXTRA_RDEPENDS += " \
+			   packagegroup-tools-bluetooth \
+			   pm-utils \
+			   kmod \
+			   hdparm \
+			   gptfdisk \
+			   lftp \
+			   vim \
+			   ntp \
+			   boost \
+			   nodejs \
+			   networkmanager \
+			   imx-gpu-viv \
+			   "
+
+BBMASK_prepend = "fsl-image-mfgtool-initramfs "
+
+# Packages added to all images (including core-image-minimal)
+IMAGE_INSTALL_append = " \
+	firmware-imx-sdma \
+	firmware-imx-epdc \
+	fsl-rc-local \
+"
+
+IMAGE_FSTYPES = "tar.bz2"
+
+# Ship all kernel modules by default
+MACHINE_EXTRA_RRECOMMENDS = "kernel-modules"
+
+MACHINE_FIRMWARE_append_mx8 = " linux-firmware-ath10k"
diff --git a/conf/machine/smarcimx8mm4g.conf b/conf/machine/smarcimx8mm4g.conf
new file mode 100644
index 0000000..013a7d5
--- /dev/null
+++ b/conf/machine/smarcimx8mm4g.conf
@@ -0,0 +1,86 @@
+#@TYPE: Machine
+#@NAME: EMBEDIAN SMARC-iMX8MM COMPUTER ON MODULES with 4GB LPDDR4 MEMORY
+#@SOC: i.MX8MM
+#@DESCRIPTION: Machine configuration for Embedian SMARC-iMX8MM
+#@MAINTAINER: Eric Lee <eric.lee@embedian.com>
+#
+# http://www.www.embedian.com
+
+MACHINEOVERRIDES =. "mx8:mx8m:mx8mm:"
+require conf/machine/include/imx-base.inc
+require conf/machine/include/arm/arch-arm64.inc
+
+MACHINE_FEATURES += " usbgadget vfat ext2 alsa serial pci wifi bluetooth"
+
+IMAGE_FEATURES += "package-management"
+
+# Embedian BSP default providers
+PREFERRED_PROVIDER_virtual/kernel_smarcimx8mm4g ?= "linux-smarcimx8mm"
+PREFERRED_VERSION_linux-smarcimx8mm4g_smarcimx8mm4g = "4.14.98"
+
+KERNEL_DEVICETREE = " \
+        embedian/fsl-smarcimx8mm.dtb \
+"
+IMAGE_BOOTFILES_DEPENDS += "imx-m4-demos:do_deploy"
+IMAGE_BOOTFILES += "imx8mm_m4_TCM_hello_world.bin imx8mm_m4_TCM_rpmsg_lite_pingpong_rtos_linux_remote.bin imx8mm_m4_TCM_rpmsg_lite_str_echo_rtos.bin"
+
+PREFERRED_PROVIDER_u-boot_smarcimx8mm4g = "u-boot-smarcimx8mm"
+PREFERRED_PROVIDER_virtual/bootloader_smarcimx8mm4g = "u-boot-smarcimx8mm"
+
+UBOOT_CONFIG ??= "sd"
+UBOOT_CONFIG[sd] = "smarcimx8mm_4g_ser3_defconfig,sdcard"
+SPL_BINARY = "spl/u-boot-spl.bin"
+
+# Set DDR FIRMWARE
+DDR_FIRMWARE_NAME = "lpddr4_pmu_train_1d_imem.bin lpddr4_pmu_train_1d_dmem.bin lpddr4_pmu_train_2d_imem.bin lpddr4_pmu_train_2d_dmem.bin"
+
+# Set U-Boot DTB
+UBOOT_DTB_NAME = "fsl-smarcimx8mm.dtb"
+
+# Set imx-mkimage boot target
+IMXBOOT_TARGETS = "flash_evk"
+
+SERIAL_CONSOLE = "115200 ttymxc1"
+
+IMAGE_BOOTLOADER = "imx-boot"
+
+BOOT_SPACE = "65536"
+
+LOADADDR = ""
+UBOOT_SUFFIX = "bin"
+UBOOT_MAKE_TARGET = ""
+IMX_BOOT_SEEK = "33"
+
+PREFERRED_RPROVIDER_ptpd = "ptpd"
+PREFERRED_RPROVIDER_ptpd-dev = "ptpd"
+
+MACHINE_EXTRA_RDEPENDS += " \
+			   packagegroup-tools-bluetooth \
+			   pm-utils \
+			   kmod \
+			   hdparm \
+			   gptfdisk \
+			   lftp \
+			   vim \
+			   ntp \
+			   boost \
+			   nodejs \
+			   networkmanager \
+			   imx-gpu-viv \
+			   "
+
+BBMASK_prepend = "fsl-image-mfgtool-initramfs "
+
+# Packages added to all images (including core-image-minimal)
+IMAGE_INSTALL_append = " \
+	firmware-imx-sdma \
+	firmware-imx-epdc \
+	fsl-rc-local \
+"
+
+IMAGE_FSTYPES = "tar.bz2"
+
+# Ship all kernel modules by default
+MACHINE_EXTRA_RRECOMMENDS = "kernel-modules"
+
+MACHINE_FIRMWARE_append_mx8 = " linux-firmware-ath10k"
diff --git a/recipes-bsp/imx-atf/imx-atf/imx8mm-atf-uart4.patch b/recipes-bsp/imx-atf/imx-atf/imx8mm-atf-uart4.patch
new file mode 100644
index 0000000..14eb97a
--- /dev/null
+++ b/recipes-bsp/imx-atf/imx-atf/imx8mm-atf-uart4.patch
@@ -0,0 +1,14 @@
+diff --git a/plat/imx/imx8mm/imx8mm_bl31_setup.c b/plat/imx/imx8mm/imx8mm_bl31_setup.c
+index aa1c336e2..8abb61f5a 100644
+--- a/plat/imx/imx8mm/imx8mm_bl31_setup.c
++++ b/plat/imx/imx8mm/imx8mm_bl31_setup.c
+@@ -310,7 +310,8 @@ void bl31_early_platform_setup2(u_register_t arg0, u_register_t arg1,
+ 
+ 	/* Assign M4 to domain 1 */
+ 	mmio_write_32(IMX_RDC_BASE + 0x204, 0x1);
+-	mmio_write_32(IMX_RDC_BASE + 0x518, 0xfc);
++	/* Assign UART4 to domain 0 */
++	mmio_write_32(IMX_RDC_BASE + 0x518, 0xff);
+ 	mmio_write_32(IMX_RDC_BASE + 0x5A4, 0xf3);
+ 
+ #if defined (CSU_RDC_TEST)
diff --git a/recipes-bsp/imx-atf/imx-atf_2.0.bbappend b/recipes-bsp/imx-atf/imx-atf_2.0.bbappend
new file mode 100644
index 0000000..979ed0b
--- /dev/null
+++ b/recipes-bsp/imx-atf/imx-atf_2.0.bbappend
@@ -0,0 +1,3 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+SRC_URI += "file://imx8mm-atf-uart4.patch"
diff --git a/recipes-bsp/imx-mkimage/imx-boot_0.2.bbappend b/recipes-bsp/imx-mkimage/imx-boot_0.2.bbappend
index e14a0b1..ce99644 100644
--- a/recipes-bsp/imx-mkimage/imx-boot_0.2.bbappend
+++ b/recipes-bsp/imx-mkimage/imx-boot_0.2.bbappend
@@ -1,7 +1,7 @@
-# Workaround to fix do_compile() failure due to missing fsl-imx8mq-evk.dtb
+# Workaround to fix do_compile() failure due to missing fsl-imx8mm-evk.dtb
 do_compile_prepend() {
 	echo "Copying DTB"
-        if [ -f ${DEPLOY_DIR_IMAGE}/${BOOT_TOOLS}/fsl-smarcimx8mq.dtb ]; then
-          cp ${DEPLOY_DIR_IMAGE}/${BOOT_TOOLS}/fsl-smarcimx8mq.dtb ${S}/iMX8M/fsl-imx8mq-evk.dtb
+        if [ -f ${DEPLOY_DIR_IMAGE}/${BOOT_TOOLS}/fsl-smarcimx8mm.dtb ]; then
+          cp ${DEPLOY_DIR_IMAGE}/${BOOT_TOOLS}/fsl-smarcimx8mm.dtb ${S}/iMX8M/fsl-imx8mm-evk.dtb
         fi
 }
diff --git a/recipes-bsp/u-boot/u-boot-smarcimx8mm_2018.03.bb b/recipes-bsp/u-boot/u-boot-smarcimx8mm_2018.03.bb
new file mode 100644
index 0000000..2d53c2e
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot-smarcimx8mm_2018.03.bb
@@ -0,0 +1,55 @@
+# Copyright (C) 2013-2016 Freescale Semiconductor
+# Copyright 2017-2018 NXP
+
+DESCRIPTION = "i.MX U-Boot suppporting i.MX reference boards."
+require recipes-bsp/u-boot/u-boot.inc
+inherit pythonnative
+
+PROVIDES += "u-boot"
+DEPENDS_append = " python dtc-native"
+
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://Licenses/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263"
+
+UBOOT_SRC ?= "${EMB_UBOOT_MIRROR};protocol=ssh"
+SRCBRANCH = "smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga"
+SRC_URI = "${UBOOT_SRC};branch=${SRCBRANCH}"
+SRCREV = "77f9e189ffd989486d49035ba08c1c76e1e19e8c"
+
+S = "${WORKDIR}/git"
+
+inherit fsl-u-boot-localversion
+
+LOCALVERSION ?= "-${SRCBRANCH}"
+
+BOOT_TOOLS = "imx-boot-tools"
+
+do_deploy_append_mx8m () {
+    # Deploy the mkimage, u-boot-nodtb.bin and fsl-imx8mq-XX.dtb for mkimage to generate boot binary
+    if [ -n "${UBOOT_CONFIG}" ]
+    then
+        for config in ${UBOOT_MACHINE}; do
+            i=$(expr $i + 1);
+            for type in ${UBOOT_CONFIG}; do
+                j=$(expr $j + 1);
+                if [ $j -eq $i ]
+                then
+                    install -d ${DEPLOYDIR}/${BOOT_TOOLS}
+                    install -m 0777 ${B}/${config}/arch/arm/dts/${UBOOT_DTB_NAME}  ${DEPLOYDIR}/${BOOT_TOOLS}
+                    install -m 0777 ${B}/${config}/tools/mkimage  ${DEPLOYDIR}/${BOOT_TOOLS}/mkimage_uboot
+                    install -m 0777 ${B}/${config}/u-boot-nodtb.bin  ${DEPLOYDIR}/${BOOT_TOOLS}/u-boot-nodtb.bin-${MACHINE}-${UBOOT_CONFIG}
+                fi
+            done
+            unset  j
+        done
+        unset  i
+    fi
+
+}
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+COMPATIBLE_MACHINE = "(mx6|mx7|mx8)"
+
+UBOOT_NAME_mx6 = "u-boot-${MACHINE}.bin-${UBOOT_CONFIG}"
+UBOOT_NAME_mx7 = "u-boot-${MACHINE}.bin-${UBOOT_CONFIG}"
+UBOOT_NAME_mx8 = "u-boot-${MACHINE}.bin-${UBOOT_CONFIG}"
diff --git a/recipes-kernel/linux/linux-smarcimx8mm_4.14.98.bb b/recipes-kernel/linux/linux-smarcimx8mm_4.14.98.bb
new file mode 100644
index 0000000..787101d
--- /dev/null
+++ b/recipes-kernel/linux/linux-smarcimx8mm_4.14.98.bb
@@ -0,0 +1,42 @@
+# Copyright (C) 2013-2016 Freescale Semiconductor
+# Copyright 2017 NXP
+# Copyright 2019-2020 Embedian, Inc.
+# Released under the MIT license (see COPYING.MIT for the terms)
+
+SUMMARY = "Linux kernel provided and supported by Embedian"
+DESCRIPTION = "Linux kernel provided and supported by Embedian (based on the kernel imx_4.14.98_2.0.0_ga provided by NXP) \
+with focus on i.MX Family SOMs. It includes support for many IPs such as GPU, VPU and IPU."
+
+require recipes-kernel/linux/linux-imx.inc
+
+DEPENDS += "lzop-native bc-native"
+
+DEFAULT_PREFERENCE = "1"
+
+SRCBRANCH = "smarc_8mm_imx_4.14.98_2.0.0_ga"
+
+LOCALVERSION = "-${SRCBRANCH}"
+KERNEL_DEFCONFIG = "${S}/arch/arm64/configs/smarcimx8mm_defconfig"
+DEFAULT_DTB = "fsl-smarcimx8mm"
+
+KERNEL_SRC ?= "git@git.embedian.com:developer/smarc-fsl-linux-kernel.git;protocol=git"
+SRC_URI = "${EMB_KERNEL_MIRROR};protocol=ssh;branch=${SRCBRANCH}"
+SRCREV = "3d1e6a796a51ee3e393c458b1b2b908ee7bb6827"
+
+S = "${WORKDIR}/git"
+
+addtask copy_defconfig after do_unpack before do_preconfigure
+do_copy_defconfig () {
+    install -d ${B}
+        mkdir -p ${B}
+        cp ${KERNEL_DEFCONFIG} ${B}/.config
+        cp ${KERNEL_DEFCONFIG} ${B}/../defconfig
+}
+
+pkg_postinst_kernel-devicetree_append_mx8 () {
+    cd $D/boot
+    ln -s ${DEFAULT_DTB}.dtb ${UBOOT_DTB_NAME}
+}
+
+COMPATIBLE_MACHINE = "(mx6|mx7|mx8)"
+EXTRA_OEMAKE_append_mx8 = " ARCH=arm64"
diff --git a/scripts/emb_mk_yocto_sdcard/README.txt b/scripts/emb_mk_yocto_sdcard/README.txt
index 8747d67..788c710 100644
--- a/scripts/emb_mk_yocto_sdcard/README.txt
+++ b/scripts/emb_mk_yocto_sdcard/README.txt
@@ -11,7 +11,7 @@ Before running this script you need to bitbake fsl-image-gui.
 
 
 Usage:
-sudo MACHINE=<smarcimx8m2g|smarcimx8m4g> ./emb-create-yocto-sdcard.sh [options] /dev/sdX
+sudo MACHINE=<smarcimx8mm2g|smarcimx8mn4g> ./emb-create-yocto-sdcard.sh [options] /dev/sdX
 (Change /dev/sdX to your device name)
 
 options:
diff --git a/scripts/emb_mk_yocto_sdcard/emb-create-yocto-emmc.sh b/scripts/emb_mk_yocto_sdcard/emb-create-yocto-emmc.sh
index f102f4a..661cc05 100755
--- a/scripts/emb_mk_yocto_sdcard/emb-create-yocto-emmc.sh
+++ b/scripts/emb_mk_yocto_sdcard/emb-create-yocto-emmc.sh
@@ -22,7 +22,6 @@ ROOTFS_IMAGE=rootfs.tar.bz2
 BOOTLOADER_RESERVED_SIZE=2
 PART1_SIZE=48
 BOOTLOADER_OFFSET=33
-DISPLAY=-hdmi
 PART=p
 BOOTPART=1
 ROOTFSPART=2
@@ -31,18 +30,9 @@ BOOTDIR=/boot
 check_board()
 {
 	if grep -q "i.MX8M" /sys/devices/soc0/soc_id; then
-		BOARD=smarc-imx8m
-		DTB_PREFIX=fsl-smarcimx8mq
+		BOARD=smarc-imx8mm
+		DTB_PREFIX=fsl-smarcimx8mm
 		BLOCK=mmcblk0
-
-		if [[ $DISPLAY != "-lvds" && $DISPLAY != "-hdmi" && \
-		      $DISPLAY != "-dual-display" && $DISPLAY != "" ]]; then
-			red_bold_echo "ERROR: invalid display, should be lvds, hdmi, dual-display or empty"
-			exit 1
-		fi
-	else
-		red_bold_echo "ERROR: Unsupported board"
-		exit 1	
 	fi
 
 
@@ -65,8 +55,8 @@ check_images()
                 exit 1
         fi
 
-        if [[ ! -f $IMGS_PATH/${DTB_PREFIX}${DISPLAY}.dtb ]] ; then
-                red_bold_echo "ERROR: \"$IMGS_PATH/${DTB_PREFIX}${DISPLAY}.dtb\" does not exist"
+        if [[ ! -f $IMGS_PATH/${DTB_PREFIX}.dtb ]] ; then
+                red_bold_echo "ERROR: \"$IMGS_PATH/${DTB_PREFIX}.dtb\" does not exist"
                 exit 1
         fi
 
@@ -149,7 +139,7 @@ install_kernel_to_emmc()
         mount /dev/${BLOCK}${PART}${BOOTPART} ${MOUNTDIR}
 	mkdir -p ${MOUNTDIR}/dtbs/
 	cp -v ${IMGS_PATH}/${KERNEL_IMAGE} ${MOUNTDIR}
-	cp -v ${IMGS_PATH}/${DTB_PREFIX}${DISPLAY}.dtb ${MOUNTDIR}/dtbs/fsl-smarcimx8mq.dtb
+	cp -v ${IMGS_PATH}/${DTB_PREFIX}.dtb ${MOUNTDIR}/dtbs/fsl-smarcimx8mm.dtb
 	cp -v ${IMGS_PATH}/uEnv.txt ${MOUNTDIR}
 
 	echo
@@ -171,7 +161,7 @@ install_rootfs_to_emmc()
 	tar --warning=no-timestamp -jxvf ${IMGS_PATH}/${ROOTFS_IMAGE} -C ${MOUNTDIR} --checkpoint=.1200
 
                 # Create DTB symlink
-                (cd ${MOUNTDIR}/${BOOTDIR}; ln -fs ${DTB_PREFIX}${DISPLAY}.dtb ${DTB_PREFIX}.dtb)
+                (cd ${MOUNTDIR}/${BOOTDIR}; ln -fs ${DTB_PREFIX}.dtb ${DTB_PREFIX}.dtb)
 
 	echo
 	sync
diff --git a/scripts/emb_mk_yocto_sdcard/emb-create-yocto-sdcard.sh b/scripts/emb_mk_yocto_sdcard/emb-create-yocto-sdcard.sh
index 1c2fa52..81792d9 100755
--- a/scripts/emb_mk_yocto_sdcard/emb-create-yocto-sdcard.sh
+++ b/scripts/emb_mk_yocto_sdcard/emb-create-yocto-sdcard.sh
@@ -15,15 +15,12 @@ readonly SCRIPT_START_DATE=`date +%Y%m%d`
 readonly YOCTO_ROOT="${SCRIPT_POINT}/../../../../"
 
 readonly BSP_TYPE="YOCTO"
-readonly YOCTO_BUILD=${YOCTO_ROOT}/imx8m-build-qt5wayland
+readonly YOCTO_BUILD=${YOCTO_ROOT}/imx8mm-build-qt5wayland
 readonly YOCTO_DEFAULT_IMAGE=fsl-image-qt5-validation-imx
 
 readonly YOCTO_SCRIPTS_PATH=${SCRIPT_POINT}
 readonly YOCTO_IMGS_PATH=${YOCTO_BUILD}/tmp/deploy/images/${MACHINE}
 
-## display (one of "-hdmi", "-lcdif-lvds", "-dp", "-dcss-lvds", "-dual-display", "-edp")
-readonly DISPLAY="-hdmi"
-
 # $1 -- block device
 # $2 -- output images dir
 readonly LPARAM_BLOCK_DEVICE=${1}
@@ -100,7 +97,7 @@ echo "================================================"
 
 help() {
 	bn=`basename $0`
-	echo " Usage: MACHINE=<smarcimx8m2g|smarcimx8m4g> $bn <options> device_node"
+	echo " Usage: MACHINE=<smarcimx8mm2g|smarcimx8mm4g> $bn <options> device_node"
 	echo
 	echo " options:"
 	echo " -h		display this Help message"
@@ -117,7 +114,7 @@ if [[ $EUID -ne 0 ]] ; then
 	exit 1
 fi
 
-if [[ $MACHINE != "smarcimx8m2g" && $MACHINE != "smarcimx8m4g" ]] ; then
+if [[ $MACHINE != "smarcimx8mm2g" && $MACHINE != "smarcimx8mm4g" ]] ; then
 	help
 	exit 1
 fi
@@ -262,7 +259,7 @@ function install_yocto
    	echo "Flashing \"Image, device tree and uEnv.txt\" partition"
                 cp -v ${YOCTO_IMGS_PATH}/Image ${P1_MOUNT_DIR}/
                 mkdir -p ${P1_MOUNT_DIR}/dtbs/
-                cp -v ${YOCTO_IMGS_PATH}/fsl-smarcimx8mq${DISPLAY}.dtb ${P1_MOUNT_DIR}/dtbs/fsl-smarcimx8mq.dtb
+                cp -v ${YOCTO_IMGS_PATH}/fsl-smarcimx8mm.dtb ${P1_MOUNT_DIR}/dtbs/fsl-smarcimx8mm.dtb
                 cp -v ${YOCTO_SCRIPTS_PATH}/uEnv.txt ${P1_MOUNT_DIR}/
 
 	echo
@@ -296,7 +293,7 @@ function copy_images
         echo "Copying Kernel Parameter uEnv.txt to /opt/images/"
                 cp -v ${YOCTO_SCRIPTS_PATH}/uEnv_emmc.txt ${P2_MOUNT_DIR}/opt/images/Yocto/uEnv.txt
 
-	if [[ $MACHINE = "smarcimx8m2g" || ${MACHINE} = "smarcimx8m4g" ]]; then
+	if [[ $MACHINE = "smarcimx8mm2g" || ${MACHINE} = "smarcimx8mm4g" ]]; then
 		cp ${YOCTO_IMGS_PATH}/imx-boot-${MACHINE}-sd.bin-* ${P2_MOUNT_DIR}/opt/images/Yocto
 		(cd ${P2_MOUNT_DIR}/opt/images/Yocto; ln -fs imx-boot-${MACHINE}-sd.bin-flash_evk imx-boot-sd.bin)
 	else
diff --git a/scripts/emb_mk_yocto_sdcard/uEnv.txt b/scripts/emb_mk_yocto_sdcard/uEnv.txt
index 2a247ae..080d766 100644
--- a/scripts/emb_mk_yocto_sdcard/uEnv.txt
+++ b/scripts/emb_mk_yocto_sdcard/uEnv.txt
@@ -1,14 +1,11 @@
-optargs="video=HDMI-A-1:1920x1080-32@60 consoleblank=0"
-#optargs="video=HDMI-A-1:3840x2160-32@30 consoleblank=0"
-#optargs="video=HDMI-A-1:3840x2160-32@60 consoleblank=0"
 #console port SER3
-console=ttymxc0,115200 earlycon=ec_imx6q,0x30860000,115200
+console=ttymxc1,115200 earlycon=ec_imx6q,0x30890000,115200
 #console port SER2
-#console=ttymxc1,115200 earlycon=ec_imx6q,0x30890000,115200
-#console port SER1
 #console=ttymxc2,115200 earlycon=ec_imx6q,0x30880000,115200
+#console port SER1
+#console=ttymxc3,115200 earlycon=ec_imx6q,0x30a60000,115200
 #console port SER0
-#console=ttymxc3,115200 earlycon=ec_imx6q,0x30A60000,115200
+#console=ttymxc0,115200 earlycon=ec_imx6q,0x30860000,115200
 mmcdev=1
 mmcpart=1
 image=Image
@@ -22,7 +19,7 @@ ethact=FEC0
 ipaddr=192.168.1.150
 serverip=192.168.1.53
 gatewayip=192.168.1.254
-mmcargs=setenv bootargs console=${console} root=${mmcroot} rootfstype=${mmcrootfstype} ${optargs}
+mmcargs=setenv bootargs console=${console} root=${mmcroot} rootfstype=${mmcrootfstype} ${optargs} cma=400M
 uenvcmd=run loadimage; run loadfdt; run mmcboot
 # USB Boot
 #usbargs=setenv bootargs console=${console} root=${usbroot} rootfstype=${mmcrootfstype} ${optargs}
diff --git a/scripts/emb_mk_yocto_sdcard/uEnv_emmc.txt b/scripts/emb_mk_yocto_sdcard/uEnv_emmc.txt
index 9dc5ff1..7650031 100644
--- a/scripts/emb_mk_yocto_sdcard/uEnv_emmc.txt
+++ b/scripts/emb_mk_yocto_sdcard/uEnv_emmc.txt
@@ -1,14 +1,11 @@
-optargs="video=HDMI-A-1:1920x1080-32@60 consoleblank=0"
-#optargs="video=HDMI-A-1:3840x2160-32@30 consoleblank=0"
-#optargs="video=HDMI-A-1:3840x2160-32@60 consoleblank=0"
 #console port SER3
-console=ttymxc0,115200 earlycon=ec_imx6q,0x30860000,115200
+console=ttymxc1,115200 earlycon=ec_imx6q,0x30890000,115200
 #console port SER2
-#console=ttymxc1,115200 earlycon=ec_imx6q,0x30890000,115200
-#console port SER1
 #console=ttymxc2,115200 earlycon=ec_imx6q,0x30880000,115200
+#console port SER1
+#console=ttymxc3,115200 earlycon=ec_imx6q,0x30a60000,115200
 #console port SER0
-#console=ttymxc3,115200 earlycon=ec_imx6q,0x30A60000,115200
+#console=ttymxc0,115200 earlycon=ec_imx6q,0x30860000,115200
 mmcdev=0
 mmcpart=1
 image=Image
@@ -22,7 +19,7 @@ ethact=FEC0
 ipaddr=192.168.1.150
 serverip=192.168.1.53
 gatewayip=192.168.1.254
-mmcargs=setenv bootargs console=${console} root=${mmcroot} rootfstype=${mmcrootfstype} ${optargs}
+mmcargs=setenv bootargs console=${console} root=${mmcroot} rootfstype=${mmcrootfstype} ${optargs} cma=400M
 uenvcmd=run loadimage; run loadfdt; run mmcboot
 # USB Boot
 #usbargs=setenv bootargs console=${console} root=${usbroot} rootfstype=${mmcrootfstype} ${optargs}