diff --git a/imx8m/smarc_mx8mq/BoardConfig.mk b/imx8m/smarc_mx8mq/BoardConfig.mk
index afb8e25..f7d6faf 100644
--- a/imx8m/smarc_mx8mq/BoardConfig.mk
+++ b/imx8m/smarc_mx8mq/BoardConfig.mk
@@ -144,7 +144,7 @@ CMASIZE=736M
 endif
 
 KERNEL_NAME := Image
-BOARD_KERNEL_CMDLINE := init=/init androidboot.gui_resolution=1080p androidboot.console=ttymxc0 androidboot.hardware=freescale androidboot.fbTileSupport=enable cma=$(CMASIZE) androidboot.primary_display=imx-drm firmware_class.path=/vendor/firmware transparent_hugepage=never
+BOARD_KERNEL_CMDLINE := console=ttymxc0,115200 earlycon=imxuart,0x30860000,115200 init=/init androidboot.gui_resolution=1080p androidboot.console=ttymxc0 androidboot.hardware=freescale androidboot.fbTileSupport=enable cma=$(CMASIZE) androidboot.primary_display=imx-drm firmware_class.path=/vendor/firmware transparent_hugepage=never
 
 # Default wificountrycode
 BOARD_KERNEL_CMDLINE += androidboot.wificountrycode=CN
diff --git a/scripts/sh/smarc-mkemmccard.sh b/scripts/sh/smarc-mkemmccard.sh
new file mode 100755
index 0000000..f610f82
--- /dev/null
+++ b/scripts/sh/smarc-mkemmccard.sh
@@ -0,0 +1,264 @@
+#!/bin/bash -e
+
+help() {
+
+bn=`basename $0`
+cat << EOF
+
+Version: 1.2
+Last change: Exit on error, and general cleanup
+
+Usage: $bn <option> device_node
+
+options:
+  -h                displays this help message
+  -s                only get partition size
+  -np               not partition.
+  -f soc_name       flash android image file with soc_name
+  -F soc_name       determine the device_node's offset to flash bootloader and flash default android image file
+                          SoC                       offset(KB)
+                        default                          1
+                        imx8dv                          16
+                        imx8qm/imx8qxp/imx8mq           33
+  -a                only flash image to slot_a
+  -b                only flash image to slot_b
+  -c card_size      optional setting: 7 / 14 / 28
+                        If not set, use partition-table.img (default)
+                        If set to  7, use partition-table-7GB.img  for  8GB SD card
+                        If set to 14, use partition-table-14GB.img for 16GB SD card
+                        If set to 28, use partition-table-28GB.img for 32GB SD card
+                    Make sure the corresponding file exist for your platform.
+  -m                flash m4 image
+  -o force_offset   force set uboot offset
+EOF
+
+}
+
+# parse command line
+moreoptions=1
+node="na"
+soc_name=""
+force_offset=""
+cal_only=0
+card_size=0
+bootloader_offset=1
+m4_image_offset=5120
+vaild_gpt_size=17
+not_partition=0
+slot=""
+systemimage_file="system.img"
+systemimage_raw_file="system_raw.img"
+vendor_file="vendor.img"
+vendor_raw_file="vendor_raw.img"
+partition_file="partition-table.img"
+g_sizes=0
+append_soc_name=0
+support_dtbo=0
+flash_m4=0
+RED='\033[0;31m'
+STD='\033[0;0m'
+
+while [ "$moreoptions" = 1 -a $# -gt 0 ]; do
+    case $1 in
+        -h) help; exit ;;
+        -s) cal_only=1 ;;
+        -f) append_soc_name=1 ; soc_name=$2; shift;;
+        -F) soc_name=$2; shift;;
+        -c) card_size=$2; shift;;
+        -np) not_partition=1 ;;
+        -a) slot="_a" ;;
+        -b) slot="_b" ;;
+        -m) flash_m4=1 ;;
+        -o) force_offset=$2; shift;;
+        *)  moreoptions=0; node=$1 ;;
+    esac
+    [ "$moreoptions" = 0 ] && [ $# -gt 1 ] && help && exit
+    [ "$moreoptions" = 1 ] && shift
+done
+
+# check required applications are installed
+#command -v simg2img >/dev/null 2>&1 || { echo -e >&2 "${RED}Missing simg2img app. Please run: sudo apt-get install android-tools-fsutils${STD}" ; exit 1 ; }
+command -v hdparm >/dev/null 2>&1 || { echo -e >&2 "${RED}Missing hdparm app. Please make sure it is installed. Exiting.${STD}" ; exit 1 ; }
+command -v gdisk >/dev/null 2>&1 || { echo -e >&2 "${RED}Missing gdisk app. Please make sure it is installed. Exiting.${STD}" ; exit 1 ; }
+
+if [ ${card_size} -ne 0 ] && [ ${card_size} -ne 7 ] && [ ${card_size} -ne 14 ] && [ ${card_size} -ne 28 ]; then
+    help; exit 1;
+fi
+
+if [ "${soc_name}" = "imx8dv" ]; then
+    bootloader_offset=16
+fi
+
+if [ "${soc_name}" = "imx8qxp" -o "${soc_name}" = "imx8qm" ]; then
+    bootloader_offset=32
+fi
+
+if [ "${soc_name}" = "imx8mq" -o "${soc_name}" = "imx8mm" -o "${soc_name}" = "smarcimx8mq" -o "${soc_name}" = "smarcimx8mq-hdmi" -o "${soc_name}" = "smarcimx8mq-dp" -o "${soc_name}" = "smarcimx8mq-lcdif-lvds" -o "${soc_name}" = "smarcimx8mq-dcss-lvds" -o "${soc_name}" = "smarcimx8mq-dual-display" -o "${soc_name}" = "smarcimx8mq-edp" ]; then
+    bootloader_offset=33
+fi
+
+if [ "${force_offset}" != "" ]; then
+    bootloader_offset=${force_offset}
+fi
+
+if [ ! -e ${node} ]; then
+    help
+    exit 1
+fi
+
+echo "${soc_name} bootloader offset is: ${bootloader_offset}"
+
+if [ "${soc_name}" != "" ] && [ "${append_soc_name}" -eq 1 ]; then
+    soc_name="-${soc_name}"
+else
+    soc_name=""
+fi
+
+# dump partitions
+if [ "${cal_only}" -eq "1" ]; then
+    gdisk -l ${node} 2>/dev/null | grep -A 20 "Number  "
+    exit 0
+fi
+
+function get_partition_size
+{
+    start_sector=`gdisk -l ${node} | grep -w $1 | awk '{print $2}'`
+    end_sector=`gdisk -l ${node} | grep -w $1 | awk '{print $3}'`
+    # 1 sector = 512 bytes. This will change unit from sector to MBytes.
+    let "g_sizes=($end_sector - $start_sector + 1) / 2048"
+}
+
+function format_partition
+{
+    num=`gdisk -l ${node} | grep -w $1 | awk '{print $1}'`
+    if [ ${num} -gt 0 ] 2>/dev/null; then
+        echo "format_partition: $1:${node}p${num} ext4"
+        mkfs.ext4 -F ${node}p${num} -L$1
+    fi
+}
+
+function erase_partition
+{
+    num=`gdisk -l ${node} | grep -w $1 | awk '{print $1}'`
+    if [ ${num} -gt 0 ] 2>/dev/null; then
+        get_partition_size $1
+        echo "erase_partition: $1 : ${node}p${num} ${g_sizes}M"
+        dd if=/dev/zero of=${node}p${num} bs=1048576 conv=fsync count=$g_sizes
+    fi
+}
+
+function flash_partition
+{
+    for num in `gdisk -l ${node} | grep -E -w "$1|$1_a|$1_b" | awk '{print $1}'`
+    do
+        if [ $? -eq 0 ]; then
+            if [ $(echo ${1} | grep "system") != "" ] 2>/dev/null; then
+                img_name=${systemimage_raw_file}
+            elif [ $(echo ${1} | grep "vendor") != "" ] 2>/dev/null; then
+                img_name=${vendor_raw_file}
+            elif [ ${support_dtbo} -eq 1 ] && [ $(echo ${1} | grep "boot") != "" ] 2>/dev/null; then
+                img_name="boot.img"
+            else
+                img_name="${1%_*}${soc_name}.img"
+            fi
+            echo "flash_partition: ${img_name} ---> ${node}p${num}"
+            if [ ! -f "${img_name}" ]; then
+                echo -e >&2 "${RED}File ${img_name} not found. Please check. Exiting${STD}"
+                return 1
+            fi
+            dd if=${img_name} of=${node}p${num} bs=10M conv=fsync
+        fi
+    done
+}
+
+function format_android
+{
+    echo "formating android images"
+    format_partition userdata
+    format_partition cache
+    erase_partition presistdata
+    erase_partition fbmisc
+    erase_partition misc
+}
+
+function make_partition
+{
+    if [ ${card_size} -gt 0 ]; then
+        partition_file="partition-table-${card_size}GB.img"
+    fi
+    if [ ! -f "${partition_file}" ]; then
+        echo -e >&2 "${RED}File ${partition_file} not found. Please check. Exiting${STD}"
+        return 1
+    fi
+    echo "make gpt partition for android: ${partition_file}"
+    dd if=${partition_file} of=${node} bs=1k count=${vaild_gpt_size} conv=fsync
+}
+
+function flash_android
+{
+    boot_partition="boot"${slot}
+    recovery_partition="recovery"${slot}
+    system_partition="system"${slot}
+    vendor_partition="vendor"${slot}
+    vbmeta_partition="vbmeta"${slot}
+    dtbo_partition="dtbo"${slot}
+    gdisk -l ${node} 2>/dev/null | grep -q "dtbo" && support_dtbo=1
+
+    bootloader_file="u-boot-imx8mq-smarcimx8mq_2g.imx"
+    if [ "${support_dtbo}" -eq "1" ] ; then
+        flash_partition ${dtbo_partition} || exit 1
+    fi
+    flash_partition ${boot_partition}  || exit 1
+    flash_partition ${recovery_partition}  || exit 1
+    #simg2img ${systemimage_file} ${systemimage_raw_file}
+    flash_partition ${system_partition} || exit 1
+    #rm ${systemimage_raw_file}
+    #simg2img ${vendor_file} ${vendor_raw_file}
+    flash_partition ${vendor_partition} || exit 1
+    #rm ${vendor_raw_file}
+    flash_partition ${vbmeta_partition} || exit 1
+    echo "erase_partition: uboot : ${node}"
+    echo "flash_partition: ${bootloader_file} ---> ${node}"
+    first_partition_offset=`gdisk -l ${node} | grep ' 1 ' | awk '{print $2}'`
+    # the unit of first_partition_offset is sector size which is 512 Byte.
+    count_bootloader=`expr ${first_partition_offset} / 2 - ${bootloader_offset}`
+    echo "the bootloader partition size: ${count_bootloader}"
+    dd if=/dev/zero of=${node} bs=1k seek=${bootloader_offset} conv=fsync count=${count_bootloader}
+    dd if=${bootloader_file} of=${node} bs=1k seek=${bootloader_offset} conv=fsync
+    if [ "${flash_m4}" -eq "1" ] ; then
+        m4_image=${soc_name#*-}"_m4_demo.img"
+        echo "flash_partition: ${m4_image} ---> ${node}"
+        dd if=${m4_image} of=${node} bs=1k seek=${m4_image_offset} conv=fsync
+    fi
+}
+
+if [ "${not_partition}" -eq "1" ] ; then
+    flash_android || exit 1
+    exit 0
+fi
+
+make_partition || exit 1
+
+sleep 3
+for i in `cat /proc/mounts | grep "${node}" | awk '{print $2}'`; do umount $i; done
+hdparm -z ${node}
+
+# backup the GPT table to last LBA for sd card.
+echo -e 'r\ne\nY\nw\nY\nY' |  gdisk ${node}
+
+format_android
+flash_android || exit 1
+
+echo
+echo ">>>>>>>>>>>>>> Flashing successfully completed <<<<<<<<<<<<<<"
+
+exit 0
+
+# For MFGTool Notes:
+# MFGTool use mksdcard-android.tar store this script
+# if you want change it.
+# do following:
+#   tar xf mksdcard-android.sh.tar
+#   vi mksdcard-android.sh 
+#   [ edit want you want to change ]
+#   rm mksdcard-android.sh.tar; tar cf mksdcard-android.sh.tar mksdcard-android.sh