diff --git a/scripts/sh/smarc-mksdcard.sh b/scripts/sh/smarc-mksdcard.sh
index 398d70a..0fd7407 100644
--- a/scripts/sh/smarc-mksdcard.sh
+++ b/scripts/sh/smarc-mksdcard.sh
@@ -1,336 +1,215 @@
 #!/bin/bash
-# Meant to be called by install_android.sh
-set -e
 
-blue_underlined_bold_echo()
-{
-	echo -e "\e[34m\e[4m\e[1m$@\e[0m"
-}
-
-blue_bold_echo()
-{
-	echo -e "\e[34m\e[1m$@\e[0m"
-}
-
-red_bold_echo()
-{
-	echo -e "\e[31m\e[1m$@\e[0m"
-}
-
-# Partition sizes in MiB
-BOOTLOAD_RESERVE=8
-BOOT_ROM_SIZE=32
-SYSTEM_ROM_SIZE=1536
-MISC_SIZE=4
-METADATA_SIZE=2
-PRESISTDATA_SIZE=1
-VENDOR_ROM_SIZE=112
-FBMISC_SIZE=1
-VBMETA_SIZE=1
+# android-tools-fsutils should be installed as
+# "sudo apt-get install android-tools-fsutils"
 
 help() {
 
-	bn=`basename $0`
-	echo " usage $bn <option> device_node"
-	echo
-	echo " options:"
-	echo " -h			displays this help message"
-	echo " -s			only get partition size"
-	echo " -f soc_name		flash android image."
+bn=`basename $0`
+cat << EOF
+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
+					If set to 7, use partition-table-7GB.img for 7GB SD card
+EOF
+
 }
 
-# Parse command line
+# parse command line
 moreoptions=1
 node="na"
-soc_name="showoptions"
+soc_name=""
 cal_only=0
-
+card_size=0
+bootloader_offset=1
+vaild_gpt_size=17
+not_partition=0
+not_format_fs=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
 while [ "$moreoptions" = 1 -a $# -gt 0 ]; do
 	case $1 in
-		-h) help; exit ;;
-		-s) cal_only=1 ;;
-		-f) soc_name=$2; shift;;
-		*)  moreoptions=0; node=$1 ;;
+	    -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 ;;
+	    -nf) not_format_fs=1 ;;
+	    -a) slot="_a" ;;
+	    -b) slot="_b" ;;
+	    *)  moreoptions=0; node=$1 ;;
 	esac
-	[ "$moreoptions" = 0 ] && [ $# -gt 2 ] && help && exit
+	[ "$moreoptions" = 0 ] && [ $# -gt 1 ] && help && exit
 	[ "$moreoptions" = 1 ] && shift
 done
 
-imagesdir="out/target/product/smarc_mx8m"
-
-img_prefix="boot-"
-img_search_str="ls ${imagesdir}/${img_prefix}* | grep sd"
-img_list=()
-
-# generate options list
-for img in $(eval $img_search_str)
-do
-	img=$(basename $img .img)
-	img=${img#${img_prefix}}
-	img_list+=($img)
-done
-
-# check for dtb
-if [[ $soc_name != "showoptions" ]] && [[ ! ${img_list[@]} =~ $soc_name ]] ; then
-	echo; red_bold_echo "ERROR: invalid dtb $soc_name"
-	soc_name=showoptions
+if [ ${card_size} -ne 0 ] && [ ${card_size} -ne 7 ] && [ ${card_size} -ne 14 ] && [ ${card_size} -ne 28 ]; then
+    help; exit;
 fi
 
-if [[ $soc_name == "showoptions" ]] ; then
-	PS3='Please choose your configuration: '
-	select opt in "${img_list[@]}"
-	do
-		if [[ -z "$opt" ]] ; then
-			echo invalid option
-			continue
-		else
-			soc_name=$opt
-			break
-		fi
-	done
+if [ "${soc_name}" = "imx8dv" ]; then
+    bootloader_offset=16
 fi
 
-bootimage_file="boot-${soc_name}.img"
-vbmeta_file="vbmeta-${soc_name}.img"
-systemimage_file="system.img"
-systemimage_raw_file="system_raw.img"
-vendorimage_file="vendor.img"
-vendorimage_raw_file="vendor_raw.img"
-
-block=`basename $node`
-part=""
-if [[ $block == mmcblk* ]] ; then
-	part="p"
-fi
 
-if [[ "${soc_name}" = *"mx8m"* ]]; then
-	bootloader_offset=33
-	bootloader_file="boot-fsl-smarcimx8mq.imx"
+if [ "${soc_name}" = "imx8qm" -o "${soc_name}" = "imx8qxp" -o "${soc_name}" = "imx8mq" -o "${soc_name}" = "fsl-smarcimx8mq" -o "${soc_name}" = "fsl-smarcimx8mq-hdmi" -o "${soc_name}" = "fsl-smarcimx8mq-hdmi-4k" -o "${soc_name}" = "fsl-smarcimx8mq-lcdif-lvds" -o "${soc_name}" = "fsl-smarcimx8mq-dcss-lvds" -o "${soc_name}" = "fsl-smarcimx8mq-dual-display" ]; then
+    bootloader_offset=33
 fi
 
 echo "${soc_name} bootloader offset is: ${bootloader_offset}"
-echo "${soc_name} bootloader is: ${bootloader_file}"
 
-# Get total device size
-seprate=100
-total_size=`sfdisk -s ${node}`
-total_size=`expr ${total_size} \/ 1024`
-boot_rom_sizeb=`expr ${BOOTLOAD_RESERVE} + ${BOOT_ROM_SIZE} \* 2`
-extend_size=`expr ${SYSTEM_ROM_SIZE} \* 2 + ${MISC_SIZE} + ${METADATA_SIZE} + ${PRESISTDATA_SIZE} + ${VENDOR_ROM_SIZE} \* 2 + ${FBMISC_SIZE} + ${VBMETA_SIZE} \* 2 + ${seprate}`
-data_size=`expr ${total_size} - ${boot_rom_sizeb} - ${extend_size}`
+if [ "${soc_name}" != "" ] && [ "${append_soc_name}" -eq 1 ]; then
+    soc_name="-${soc_name}"
+else
+    soc_name=""
+fi
 
-# Echo partitions
-cat << EOF
-TOTAL            : ${total_size} MiB
-U-BOOT (on eMMC) : ${BOOTLOAD_RESERVE} MiB
-BOOT_A           : ${BOOT_ROM_SIZE} MiB
-BOOT_B           : ${BOOT_ROM_SIZE} MiB
-SYSTEM_A         : ${SYSTEM_ROM_SIZE} MiB
-SYSTEM_B         : ${SYSTEM_ROM_SIZE} MiB
-MISC             : ${MISC_SIZE} MiB
-METADATA         : ${METADATA_SIZE} MiB
-PRESISTDATA      : ${PRESISTDATA_SIZE} MiB
-VENDOR_A         : ${VENDOR_ROM_SIZE} MiB
-VENDOR_B         : ${VENDOR_ROM_SIZE} MiB
-USERDATA         : ${data_size} MiB
-FBMISC           : ${FBMISC_SIZE} MiB
-VBMETA_A         : ${VBMETA_SIZE} MiB
-VBMETA_B         : ${VBMETA_SIZE} MiB
-EOF
+if [ ! -e ${node} ]; then
+	help
+	exit
+fi
 
-echo
 
-if [[ $cal_only == 1 ]] ; then
-exit 0
+# dump partitions
+if [ "${cal_only}" -eq "1" ]; then
+gdisk -l ${node} 2>/dev/null | grep -A 20 "Number  "
+exit
 fi
 
-function check_images
+function get_partition_size
 {
-	if [[ ! -b $node ]] ; then
-		red_bold_echo "ERROR: \"$node\" is not a block device"
-		exit 1
-	fi
-
-	if [[ ! -f ${imagesdir}/${bootloader_file} ]] ; then
-		red_bold_echo "ERROR: U-Boot image does not exist"
-		exit 1
-	fi
-
-	if [[ ! -f ${imagesdir}/${bootimage_file} ]] ; then
-		red_bold_echo "ERROR: boot image does not exist"
-		exit 1
-	fi
-
-	if [[ ! -f ${imagesdir}/${systemimage_file} ]] ; then
-		red_bold_echo "ERROR: system image does not exist"
-		exit 1
-	fi
-
-	if [[ ! -f ${imagesdir}/${vendorimage_file} ]] ; then
-		red_bold_echo "ERROR: vendor image does not exist"
-		exit 1
-	fi
-
-	if [[ ! -f ${imagesdir}/${vbmeta_file} ]] ; then
-		red_bold_echo "ERROR: vbmeta image does not exist"
-		exit 1
-	fi
+    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 delete_device
+function format_partition
 {
-	echo
-	blue_underlined_bold_echo "Deleting current partitions"
-	for partition in ${node}*
-	do
-		if [[ ${partition} = ${node} ]] ; then
-			# skip base node
-			continue
-		fi
-		if [[ ! -b ${partition} ]] ; then
-			red_bold_echo "ERROR: \"${partition}\" is not a block device"
-			exit 1
-		fi
-		dd if=/dev/zero of=${partition} bs=1M count=1 2> /dev/null || true
-	done
-	sync
-
-	((echo d; echo 1; echo d; echo 2; echo d; echo 3; echo d; echo w) | fdisk $node &> /dev/null) || true
-	sync
-
-	sgdisk -Z $node
-	sync
-
-	dd if=/dev/zero of=$node bs=1M count=8
-	sync; sleep 1
+    num=`gdisk -l ${node} | grep -w $1 | awk '{print $1}'`
+    if [ ${num} -gt 0 ] 2>/dev/null; then
+        echo "format_partition: $1:${node}${num} ext4"
+        mkfs.ext4 -F ${node}${num} -L$1
+    fi
 }
 
-function create_parts
+function erase_partition
 {
-	echo
-	blue_underlined_bold_echo "Creating Android partitions"
-
-	sgdisk -n 1:${BOOTLOAD_RESERVE}M:+${BOOT_ROM_SIZE}M -c 1:"boot_a"      -t 1:8300  $node
-	sgdisk -n 2:0:+${BOOT_ROM_SIZE}M                    -c 2:"boot_b"      -t 2:8300  $node
-	sgdisk -n 3:0:+${SYSTEM_ROM_SIZE}M                  -c 3:"system_a"    -t 3:8300  $node
-	sgdisk -n 4:0:+${SYSTEM_ROM_SIZE}M                  -c 4:"system_b"    -t 4:8300  $node
-	sgdisk -n 5:0:+${MISC_SIZE}M                        -c 5:"misc"        -t 5:8300  $node
-	sgdisk -n 6:0:+${METADATA_SIZE}M                    -c 6:"metadata"    -t 6:8300  $node
-	sgdisk -n 7:0:+${PRESISTDATA_SIZE}M                 -c 7:"presistdata" -t 7:8300  $node
-	sgdisk -n 8:0:+${VENDOR_ROM_SIZE}M                  -c 8:"vendor_a"    -t 8:8300  $node
-	sgdisk -n 9:0:+${VENDOR_ROM_SIZE}M                  -c 9:"vendor_b"    -t 9:8300  $node
-	sgdisk -n 10:0:+${data_size}M                       -c 10:"userdata"   -t 10:8300 $node
-	sgdisk -n 11:0:+${FBMISC_SIZE}M                     -c 11:"fbmisc"     -t 11:8300 $node
-	sgdisk -n 12:0:+${VBMETA_SIZE}M                     -c 12:"vbmeta_a"   -t 12:8300 $node
-	sgdisk -n 13:0:+${VBMETA_SIZE}M                     -c 13:"vbmeta_b"   -t 13:8300 $node
-
-	sync; sleep 2
-
-	for i in `cat /proc/mounts | grep "${node}" | awk '{print $2}'`; do umount $i; done
-	hdparm -z $node
-	sync; sleep 3
-
-	# backup the GPT table to last LBA.
-	echo -e 'r\ne\nY\nw\nY\nY' |  gdisk $node
-	sync; sleep 1
-	sgdisk -p $node
+    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}${num} ${g_sizes}M"
+        dd if=/dev/zero of=${node}${num} bs=1048576 conv=fsync count=$g_sizes
+    fi
 }
 
-function install_bootloader
+function flash_partition
 {
-	echo
-	blue_underlined_bold_echo "Installing booloader"
-
-	dd if=${imagesdir}/${bootloader_file} of=$node bs=1k seek=${bootloader_offset}; sync
+    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}
+            else
+                img_name="${1%_*}${soc_name}.img"
+            fi
+            echo "flash_partition: ${img_name} ---> ${node}${num}"
+            dd if=${img_name} of=${node}${num} bs=10M conv=fsync
+        fi
+    done
 }
 
 function format_android
 {
-	echo
-	blue_underlined_bold_echo "Erasing presistdata partition"
-	dd if=/dev/zero of=${node}${part}7 bs=1M count=${PRESISTDATA_SIZE} conv=fsync
-	blue_underlined_bold_echo "Erasing fbmisc partition"
-	dd if=/dev/zero of=${node}${part}11 bs=1M count=${FBMISC_SIZE} conv=fsync
-	blue_underlined_bold_echo "Erasing misc partition"
-	dd if=/dev/zero of=${node}${part}5 bs=1M count=${MISC_SIZE} conv=fsync
-	blue_underlined_bold_echo "Erasing metadata partition"
-	dd if=/dev/zero of=${node}${part}6 bs=1M count=${METADATA_SIZE} conv=fsync
-	blue_underlined_bold_echo "Formating userdata partition"
-	mkfs.ext4 -F ${node}${part}10 -Ldata
-	sync; sleep 1
+    echo "formating android images"
+    format_partition userdata
+    format_partition cache
+    erase_partition presistdata
+    erase_partition fbmisc
+    erase_partition misc
 }
 
-function install_android
+function make_partition
 {
-	echo
-	blue_underlined_bold_echo "Installing Android boot image: $bootimage_file"
-	dd if=${imagesdir}/${bootimage_file} of=${node}${part}1
-	dd if=${imagesdir}/${bootimage_file} of=${node}${part}2
-	sync
-
-	echo
-	blue_underlined_bold_echo "Installing Android system image: $systemimage_file"
-	if [[ -f ${imagesdir}/${systemimage_raw_file} ]] ; then
-		rm ${imagesdir}/${systemimage_raw_file} 2> /dev/null
-	fi
-	out/host/linux-x86/bin/simg2img ${imagesdir}/${systemimage_file} ${imagesdir}/${systemimage_raw_file}
-	dd if=${imagesdir}/${systemimage_raw_file} of=${node}${part}3
-	dd if=${imagesdir}/${systemimage_raw_file} of=${node}${part}4
-	sync;
-
-	echo
-	blue_underlined_bold_echo "Installing Android vendor image: $vendorimage_file"
-	if [[ -f ${imagesdir}/${vendorimage_raw_file} ]] ; then
-		rm ${imagesdir}/${vendorimage_raw_file} 2> /dev/null
-	fi
-	out/host/linux-x86/bin/simg2img ${imagesdir}/${vendorimage_file} ${imagesdir}/${vendorimage_raw_file}
-	dd if=${imagesdir}/${vendorimage_raw_file} of=${node}${part}8
-	dd if=${imagesdir}/${vendorimage_raw_file} of=${node}${part}9
-	sync;
-
-	echo
-	blue_underlined_bold_echo "Installing Android vbmeta image: $vbmeta_file"
-	dd if=${imagesdir}/${vbmeta_file} of=${node}${part}12
-	dd if=${imagesdir}/${vbmeta_file} of=${node}${part}13
-	sync;
-
-	sleep 1
+    if [ ${card_size} -gt 0 ]; then
+        partition_file="partition-table-${card_size}GB.img"
+    fi
+    echo "make gpt partition for android: ${partition_file}"
+    dd if=${partition_file} of=${node} bs=1k count=${vaild_gpt_size} conv=fsync
 }
 
-function finish
+function flash_android
 {
-	echo
-	errors=0
-	for partition in ${node}*
-	do
-		if [[ ! -b ${partition} ]] ; then
-			red_bold_echo "ERROR: \"${partition}\" is not a block device"
-			errors=$((errors+1))
-		fi
-	done
-
-	if [[ ${errors} = 0 ]] ; then
-		blue_bold_echo "Android installed successfully"
-	else
-		red_bold_echo "Android installation failed"
-	fi
-	exit ${errors}
+    boot_partition="boot"${slot}
+    recovery_partition="recovery"${slot}
+    system_partition="system"${slot}
+    vendor_partition="vendor"${slot}
+    vbmeta_partition="vbmeta"${slot}
+
+    #bootloader_file="u-boot${soc_name}.imx"
+    bootloader_file="u-boot-smarcimx8mq_2g.imx"
+    flash_partition ${boot_partition}
+    flash_partition ${recovery_partition}
+    simg2img ${systemimage_file} ${systemimage_raw_file}
+    flash_partition ${system_partition}
+    rm ${systemimage_raw_file}
+    simg2img ${vendor_file} ${vendor_raw_file}
+    flash_partition ${vendor_partition}
+    rm ${vendor_raw_file}
+    flash_partition ${vbmeta_partition}
+    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
 }
 
-check_images
+if [ "${not_partition}" -eq "1" ] ; then
+    flash_android
+    exit
+fi
 
-umount ${node}${part}*  2> /dev/null || true
+make_partition
+sleep 3
+for i in `cat /proc/mounts | grep "${node}" | awk '{print $2}'`; do umount $i; done
+hdparm -z ${node}
 
-#Stop Udev for block devices while partitioning in progress
-#/etc/init.d/udev stop
+# backup the GPT table to last LBA for sd card.
+echo -e 'r\ne\nY\nw\nY\nY' |  gdisk ${node}
 
-delete_device
-create_parts
-install_bootloader
 format_android
-install_android
-finish
-
-#Start Udev back before exit
-#/etc/init.d/udev restart
-
+flash_android
+
+# 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
diff --git a/smarc_mx8m/BoardConfig.mk b/smarc_mx8m/BoardConfig.mk
index be41877..d0af3cc 100644
--- a/smarc_mx8m/BoardConfig.mk
+++ b/smarc_mx8m/BoardConfig.mk
@@ -85,7 +85,10 @@ NUM_FRAMEBUFFER_SURFACE_BUFFERS := 5
 ifeq ($(PRODUCT_IMX_DRM),true)
 CMASIZE=736M
 else
-CMASIZE=1536M
+# if 4GB LPDDR4
+# CMASIZE=1536M
+# if 2GB LPDDR4
+CMASIZE=736M
 endif
 
 BOARD_KERNEL_CMDLINE := console=ttymxc0,115200 earlycon=imxuart,0x30860000,115200 init=/init video=HDMI-A-1:1920x1080-32@60 androidboot.console=ttymxc0 consoleblank=0 androidboot.hardware=freescale androidboot.fbTileSupport=enable cma=$(CMASIZE) androidboot.primary_display=imx-drm firmware_class.path=/vendor/firmware