diff --git a/imx8m/smarc_mx8mq/BoardConfig.mk b/imx8m/smarc_mx8mq/BoardConfig.mk
index 0b8c864..a79bef0 100644
--- a/imx8m/smarc_mx8mq/BoardConfig.mk
+++ b/imx8m/smarc_mx8mq/BoardConfig.mk
@@ -135,12 +135,12 @@ endif
 BOARD_PREBUILT_DTBOIMAGE := out/target/product/smarc_mx8mq/dtbo-smarcimx8mq-hdmi.img
 
 TARGET_BOARD_DTS_CONFIG := \
-        smarcimx8mq-dcss-lvds:imx8mq-smarc-dcss-lvds.dtb \
-        smarcimx8mq-dp:imx8mq-smarc-dp.dtb \
-        smarcimx8mq:imx8mq-smarc.dtb \
-        smarcimx8mq-dual-display:imx8mq-smarc-dual-display.dtb \
-        smarcimx8mq-hdmi:imx8mq-smarc-hdmi.dtb \
-        smarcimx8mq-lcdif-lvds:imx8mq-smarc-lcdif-lvds.dtb
+        imx8mq-smarc-dcss-lvds:imx8mq-smarc-dcss-lvds.dtb \
+        imx8mq-smarc-dp:imx8mq-smarc-dp.dtb \
+        imx8mq-smarc:imx8mq-smarc.dtb \
+        imx8mq-smarc-dual-display:imx8mq-smarc-dual-display.dtb \
+        imx8mq-smarc-hdmi:imx8mq-smarc-hdmi.dtb \
+        imx8mq-smarc-lcdif-lvds:imx8mq-smarc-lcdif-lvds.dtb
 
 BOARD_SEPOLICY_DIRS := \
 	device/fsl/imx8m/sepolicy \
diff --git a/imx8m/smarc_mx8mq/UbootKernelBoardConfig.mk b/imx8m/smarc_mx8mq/UbootKernelBoardConfig.mk
index 09cb16f..a0fb408 100644
--- a/imx8m/smarc_mx8mq/UbootKernelBoardConfig.mk
+++ b/imx8m/smarc_mx8mq/UbootKernelBoardConfig.mk
@@ -5,15 +5,20 @@ UBOOT_POST_PROCESS := true
 TARGET_BOOTLOADER_CONFIG := \
         imx8mq-smarc_2g:smarcimx8mq_2g_ser3_android_defconfig \
         imx8mq-smarc_4g:smarcimx8mq_4g_ser3_android_defconfig \
+	imx8mq-dual-smarc_2g:smarcimx8mq_2g_ser3_android_dual_defconfig \
+	imx8mq-dual-smarc_4g:smarcimx8mq_4g_ser3_android_dual_defconfig \
         imx8mq-smarc_2g-uuu:smarcimx8mq_2g_ser3_android_uuu_defconfig \
         imx8mq-smarc_4g-uuu:smarcimx8mq_4g_ser3_android_uuu_defconfig
 ifeq ($(PRODUCT_IMX_TRUSTY),true)
   TARGET_BOOTLOADER_CONFIG += \
-	imx8mq-smarc_2g-trusty:smarcimx8mq_2g_ser3_android_trusty_defconfig \
-        imx8mq-smarc_4g-trusty:smarcimx8mq_4g_ser3_android_trusty_defconfig
+	imx8mq-trusty-smarc_2g:smarcimx8mq_2g_ser3_android_trusty_defconfig \
+        imx8mq-trusty-smarc_4g:smarcimx8mq_4g_ser3_android_trusty_defconfig
   TARGET_BOOTLOADER_CONFIG += \
-	imx8mq-smarc_2g-trusty-secure-unlock:smarcimx8mq_2g_ser3_android_trusty_secure_unlock_defconfig \
-        imx8mq-smarc_4g-trusty-secure-unlock:smarcimx8mq_4g_ser3_android_trusty_secure_unlock_defconfig 
+	imx8mq-trusty-secure-unlock-smarc_2g:smarcimx8mq_2g_ser3_android_trusty_secure_unlock_defconfig \
+        imx8mq-trusty-secure-unlock-smarc_4g:smarcimx8mq_4g_ser3_android_trusty_secure_unlock_defconfig 
+  TARGET_BOOTLOADER_CONFIG += \
+        imx8mq-trusty-dual-smarc_2g:smarcimx8mq_2g_ser3_android_trusty_dual_defconfig \
+        imx8mq-trusty-dual-smarc_4g:smarcimx8mq_4g_ser3_android_trusty_dual_defconfig
 endif
 
 TARGET_KERNEL_DEFCONFIG := imx_v8_android_defconfig
diff --git a/imx8m/smarc_mx8mq/smarc_mx8mq.mk b/imx8m/smarc_mx8mq/smarc_mx8mq.mk
index 4b1f023..336c806 100644
--- a/imx8m/smarc_mx8mq/smarc_mx8mq.mk
+++ b/imx8m/smarc_mx8mq/smarc_mx8mq.mk
@@ -2,6 +2,11 @@
 # It will inherit from FSL core product which in turn inherit from Google generic
 
 IMX_DEVICE_PATH := device/embedian/imx8m/smarc_mx8mq
+LINUX_FIRMWARE_IMX_PATH := vendor/nxp
+FSL_PROPRIETARY_PATH := vendor/nxp
+IMX_SECURITY_PATH := vendor/nxp-private/security
+IMX_PATH := vendor/nxp-opensource
+FSL_CODEC_PATH := vendor/nxp
 
 # configs shared between uboot, kernel and Android rootfs
 include $(IMX_DEVICE_PATH)/SharedBoardConfig.mk
diff --git a/imx8m/smarc_mx8mq/uuu/uuu-android-smarc-mx8mq-emmc.lst b/imx8m/smarc_mx8mq/uuu/uuu-android-smarc-mx8mq-emmc.lst
index 4d961c3..a2c850c 100755
--- a/imx8m/smarc_mx8mq/uuu/uuu-android-smarc-mx8mq-emmc.lst
+++ b/imx8m/smarc_mx8mq/uuu/uuu-android-smarc-mx8mq-emmc.lst
@@ -12,19 +12,19 @@ FB: ucmd mmc dev 0
 FB: ucmd mmc dev 0 0 
 FB: ucmd mmc erase 0x2000 0x8 
 FB: ucmd mmc partconf 0 1 1 1 
-FB[-t 600000]: flash bootloader0 u-boot-imx8mq-smarc_4g.imx 
+FB[-t 600000]: flash bootloader0 u-boot-imx8mq-trusty-smarc_4g.imx 
 FB[-t 600000]: flash gpt partition-table.img 
 FB: ucmd setenv fastboot_dev mmc 
-FB[-t 600000]: flash dtbo_a dtbo-smarcimx8mq-hdmi.img 
+FB[-t 600000]: flash dtbo_a dtbo-imx8mq-smarc-hdmi.img 
 FB[-t 600000]: flash boot_a boot.img 
-FB[-t 600000]: flash vbmeta_a vbmeta-smarcimx8mq-hdmi.img 
-FB[-t 600000]: flash dtbo_b dtbo-smarcimx8mq-hdmi.img 
+FB[-t 600000]: flash vbmeta_a vbmeta-imx8mq-smarc-hdmi.img 
+FB[-t 600000]: flash dtbo_b dtbo-imx8mq-smarc-hdmi.img 
 FB[-t 600000]: flash boot_b boot.img 
-FB[-t 600000]: flash vbmeta_b vbmeta-smarcimx8mq-hdmi.img 
+FB[-t 600000]: flash vbmeta_b vbmeta-imx8mq-smarc-hdmi.img 
 FB[-t 600000]: flash super super.img 
 FB[-t 600000]: erase misc
 FB[-t 600000]: erase presistdata
 FB[-t 600000]: erase fbmisc
 FB[-t 600000]: erase metadata
 FB[-t 600000]: erase userdata
-FB: done 
+FB: done
diff --git a/imx8m/smarc_mx8mq/uuu/uuu-android-smarc-mx8mq-sd.lst b/imx8m/smarc_mx8mq/uuu/uuu-android-smarc-mx8mq-sd.lst
index 083781d..f69f345 100755
--- a/imx8m/smarc_mx8mq/uuu/uuu-android-smarc-mx8mq-sd.lst
+++ b/imx8m/smarc_mx8mq/uuu/uuu-android-smarc-mx8mq-sd.lst
@@ -12,19 +12,19 @@ FB: ucmd mmc dev 1
 FB: ucmd mmc dev 1 0 
 FB: ucmd mmc erase 0x2000 0x8 
 FB: ucmd mmc partconf 1 1 1 1 
-FB[-t 600000]: flash bootloader0 u-boot-imx8mq-smarc_4g.imx 
+FB[-t 600000]: flash bootloader0 u-boot-imx8mq-trusty-smarc_4g.imx 
 FB[-t 600000]: flash gpt partition-table.img 
 FB: ucmd setenv fastboot_dev mmc 
-FB[-t 600000]: flash dtbo_a dtbo-smarcimx8mq-hdmi.img 
+FB[-t 600000]: flash dtbo_a dtbo-imx8mq-smarc-hdmi.img 
 FB[-t 600000]: flash boot_a boot.img 
-FB[-t 600000]: flash vbmeta_a vbmeta-smarcimx8mq-hdmi.img 
-FB[-t 600000]: flash dtbo_b dtbo-smarcimx8mq-hdmi.img 
+FB[-t 600000]: flash vbmeta_a vbmeta-imx8mq-smarc-hdmi.img 
+FB[-t 600000]: flash dtbo_b dtbo-imx8mq-smarc-hdmi.img 
 FB[-t 600000]: flash boot_b boot.img 
-FB[-t 600000]: flash vbmeta_b vbmeta-smarcimx8mq-hdmi.img 
+FB[-t 600000]: flash vbmeta_b vbmeta-imx8mq-smarc-hdmi.img 
 FB[-t 600000]: flash super super.img 
 FB[-t 600000]: erase misc
 FB[-t 600000]: erase presistdata
 FB[-t 600000]: erase fbmisc
 FB[-t 600000]: erase metadata
 FB[-t 600000]: erase userdata
-FB: done 
+FB: done
diff --git a/imx8m/smarc_mx8mq/uuu/uuu_android_smarc_flash.bat b/imx8m/smarc_mx8mq/uuu/uuu_android_smarc_flash.bat
index 91528d4..7470f65 100755
--- a/imx8m/smarc_mx8mq/uuu/uuu_android_smarc_flash.bat
+++ b/imx8m/smarc_mx8mq/uuu/uuu_android_smarc_flash.bat
@@ -79,8 +79,7 @@ set /A dont_generate_super=0
 set imx8mm_uboot_feature=dual trusty-dual 4g-evk-uuu 4g ddr4-evk-uuu ddr4 evk-uuu trusty-4g trusty-secure-unlock trusty
 set imx8mn_uboot_feature=dual trusty-dual evk-uuu trusty-secure-unlock trusty ddr4-evk-uuu ddr4
 set imx8mp_uboot_feature=dual trusty-dual evk-uuu trusty-secure-unlock trusty
-set imx8mq_uboot_feature=dual trusty-dual evk-uuu trusty-secure-unlock trusty
-set smarcimx8mq_uboot_feature=smarc_4g smarc_4g-uuu smarc_4g-trusty-secure-unlock smarc_4g-trusty smarc_2g smarc_2g-uuu smarc_2g-trusty-secure-unlock smarc_2g-trusty
+set imx8mq_uboot_feature=smarc_2g trusty-smarc_2g trusty-dual-smarc_2g trusty-secure-unlock-smarc_2g smarc_4g trusty-smarc_4g trusty-dual-smarc_4g trusty-secure-unlock-smarc_4g
 set imx8qxp_uboot_feature=mek-uuu trusty-secure-unlock trusty secure-unlock c0 trusty-c0 mek-c0-uuu
 set imx8qm_uboot_feature=mek-uuu trusty-secure-unlock trusty secure-unlock md hdmi
 set imx7ulp_uboot_feature=evk-uuu
@@ -88,8 +87,7 @@ set imx7ulp_uboot_feature=evk-uuu
 set imx8mm_dtb_feature=ddr4 m4 mipi-panel
 set imx8mn_dtb_feature=mipi-panel rpmsg ddr4 ddr4-mipi-panel ddr4-rpmsg
 set imx8mp_dtb_feature=rpmsg hdmi lvds-panel lvds mipi-panel basler ov5640
-set imx8mq_dtb_feature=dual mipi-panel mipi
-set smarcimx8mq_dtb_feature=hdmi dcss-lvds lcdif-lvds dp dual-display
+set imx8mq_dtb_feature=hdmi dcss-lvds dp lcdif-lvds dual-display dual mipi-panel mipi
 set imx8qxp_dtb_feature=
 set imx8qm_dtb_feature=hdmi mipi-panel md xen
 set imx7ulp_dtb_feature=evk-mipi evk mipi
@@ -237,15 +235,6 @@ if not [%soc_name:imx8mq=%] == [%soc_name%] (
     )
     goto :device_info_end
 )
-if not [%soc_name:smarcimx8mq=%] == [%soc_name%] (
-    set vid=0x1fc9& set pid=0x012b& set chip=MX8MQ
-    set uboot_env_start=0x2000& set uboot_env_len=0x8
-    set emmc_num=0& set sd_num=1
-    if [%board%] == [] (
-        set board=smarc
-    )
-    goto :device_info_end
-)
 if not [%soc_name:imx8mm=%] == [%soc_name%] (
     set vid=0x1fc9& set pid=00x0134& set chip=MX8MM
     set uboot_env_start=0x2000& set uboot_env_len=0x8
@@ -362,8 +351,8 @@ set sdp=SDPS
 :without_sdps
 
 :: default bootloader image name
-set bootloader_used_by_uuu=u-boot-imx8mq%uboot_feature%-uuu.imx
-set bootloader_flashed_to_board=u-boot-imx8mq%uboot_feature%.imx
+set bootloader_used_by_uuu=u-boot-%soc_name%-smarc_4g-uuu.imx
+set bootloader_flashed_to_board=u-boot-%soc_name%%uboot_feature%.imx
 
 
 :: find the names of the bootloader used by uuu
@@ -420,11 +409,11 @@ if not [%yocto_image%] == [] (
             cmd /c mklink u-boot-imx8qm-xen-dom0.imx.link %image_directory%u-boot-imx8qm-xen-dom0.imx > nul
             echo FB: flash bootloader0 u-boot-imx8qm-xen-dom0.imx.link >> uuu.lst
             :: write the xen spl from android team to FAT on SD card
-            set xen_uboot_name=spl-%soc_name%-%dtb_feature%.bin
+            set xen_uboot_name=spl-%soc_name%-smarc-%dtb_feature%.bin
             for /f "usebackq" %%A in ('%image_directory%!xen_uboot_name!') do set xen_uboot_size_dec=%%~zA
             :: directly pass the name of variable, just like pointer in C program
             call :dec_to_hex !xen_uboot_size_dec! xen_uboot_size_hex
-            echo generate lines to write spl-%soc_name%-%dtb_feature%.bin to FAT on SD card
+            echo generate lines to write spl-%soc_name%-smarc-%dtb_feature%.bin to FAT on SD card
             if exist !xen_uboot_name!.link (
                 del !xen_uboot_name!.link
             )
@@ -525,10 +514,10 @@ echo                           
 echo                           ©À©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©à©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©È
 echo                           ©¦   imx8mp       ©¦  dual trusty-dual evk-uuu trusty-secure-unlock trusty                                                ©¦
 echo                           ©À©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©à©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©È
-echo                           ©¦   imx8mq       ©¦  dual trusty-dual evk-uuu trusty-secure-unlock                                                      ©¦
+echo                           ©¦   imx8mq       ©¦  smarc_2g trusty-smarc_2g trusty-dual-smarc_2g trusty-secure-unlock-smarc_2g smarc_4g trusty-smarc_4g trusty-dual-smarc_4g trusty-secure-unlock-smarc_4g                             ©¦
 echo                           ©À©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©à©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©È
 echo                           ©À©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©à©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©È
-echo                           ©¦   smarcimx8mq  ©¦  smarc_4g-uuu smarc_4g-trusty-secure-unlock smarc_2g-uuu smarc_2g-trusty-secure-unlock                                                     ©¦
+echo                           ©¦   smarcimx8mq  ©¦  smarc_4g-uuu smarc_4g-dual smarc_4g-trusty smarc_4g-trusty-dualsmarc_4g-trusty-secure-unlock smarc_2g-uuu smarc_2g-dual smarc_2g-trusty-secure-unlock smarc_2g-trusty smarc_2g-trusty-dual                                                     ©¦
 echo                           ©À©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©à©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©È
 echo                           ©¦   imx8qxp      ©¦  mek-uuu trusty-secure-unlock trusty secure-unlock c0 trusty-c0 mek-c0-uuu                          ©¦
 echo                           ©À©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©à©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©¤©È
@@ -672,7 +661,7 @@ set local_str=%1
 set local_str=%local_str:_a=%
 set local_str=%local_str:_b=%
 
-set img_name=%local_str%-%soc_name%.img
+set img_name=%local_str%-%soc_name%-smarc.img
 
 if not [%partition_to_be_flashed:bootloader_=%] == [%partition_to_be_flashed%] (
     set img_name=%uboot_proper_to_be_flashed%
@@ -696,15 +685,15 @@ if not [%partition_to_be_flashed:mcu_os=%] == [%partition_to_be_flashed%] (
     goto :start_to_flash
 )
 if not [%partition_to_be_flashed:vbmeta=%] == [%partition_to_be_flashed%] if not [%dtb_feature%] == [] (
-    set img_name=%local_str%-%soc_name%-%dtb_feature%.img
+    set img_name=%local_str%-%soc_name%-smarc-%dtb_feature%.img
     goto :start_to_flash
 )
 if not [%partition_to_be_flashed:dtbo=%] == [%partition_to_be_flashed%] if not [%dtb_feature%] == [] (
-    set img_name=%local_str%-%soc_name%-%dtb_feature%.img
+    set img_name=%local_str%-%soc_name%-smarc-%dtb_feature%.img
     goto :start_to_flash
 )
 if not [%partition_to_be_flashed:recovery=%] == [%partition_to_be_flashed%] if not [%dtb_feature%] == [] (
-    set img_name=%local_str%-%soc_name%-%dtb_feature%.img
+    set img_name=%local_str%-%soc_name%-smarc-%dtb_feature%.img
     goto :start_to_flash
 )
 if not [%partition_to_be_flashed:bootloader=%] == [%partition_to_be_flashed%] (
@@ -781,12 +770,12 @@ goto :eof
 
 :: if dual bootloader is supported, the name of the bootloader flashed to the board need to be updated
 if %support_dual_bootloader% == 1 (
-    set bootloader_flashed_to_board=spl-imx8mq%uboot_feature%.bin
-    set uboot_proper_to_be_flashed=bootloader-imx8mq%uboot_feature%.img
+    set bootloader_flashed_to_board=spl-%soc_name%%uboot_feature%.bin
+    set uboot_proper_to_be_flashed=bootloader-%soc_name%%uboot_feature%.img
     :: # specially handle xen related condition
     if [%dtb_feature%] == [xen] (
         if [%soc_name%] == [imx8qm] (
-            set uboot_proper_to_be_flashed=bootloader-%soc_name%-%dtb_feature%.img
+            set uboot_proper_to_be_flashed=bootloader-%soc_name%-smarc-%dtb_feature%.img
         )
     )
 )
diff --git a/imx8m/smarc_mx8mq/uuu/uuu_android_smarc_flash.sh b/imx8m/smarc_mx8mq/uuu/uuu_android_smarc_flash.sh
index d7fb590..47ebf04 100755
--- a/imx8m/smarc_mx8mq/uuu/uuu_android_smarc_flash.sh
+++ b/imx8m/smarc_mx8mq/uuu/uuu_android_smarc_flash.sh
@@ -40,7 +40,7 @@ options:
                            ├────────────────┼──────────────────────────────────────────────────────────────────────────────────────────────────────┤
                            │   imx8mp       │  dual trusty-dual evk-uuu trusty-secure-unlock trusty                                                │
                            ├────────────────┼──────────────────────────────────────────────────────────────────────────────────────────────────────┤
-                           │   imx8mq       │  dual trusty-dual evk-uuu trusty-secure-unlock trusty                                                │
+                           │   imx8mq       │  smarc_2g trusty-smarc_2g trusty-dual-smarc_2g trusty-secure-unlock-smarc_2g smarc_4g trusty-smarc_4g trusty-dual-smarc_4g trusty-secure-unlock-smarc_4g                             │
                            ├────────────────┼──────────────────────────────────────────────────────────────────────────────────────────────────────┤
 ───────────────────────────────────────────────────────────────────┤
                            │   imx8mq       │  smarc_4g-uuu smarc_4g-trusty-secure-unlock smarc_2g-uuu smarc_2g-trusty-secure-unlock               │
@@ -134,7 +134,7 @@ function flash_partition
             img_name="${soc_name}_mcu_demo.img"
         fi
     elif [ "$(echo ${1} | grep -E "dtbo|vbmeta|recovery")" != "" -a "${dtb_feature}" != "" ]; then
-        img_name="${1%_*}-${soc_name}-${dtb_feature}.img"
+        img_name="${1%_*}-${soc_name}-smarc-${dtb_feature}.img"
     elif [ "$(echo ${1} | grep "gpt")" != "" ]; then
         img_name=${partition_file}
     elif [ "$(echo ${1} | grep "super")" != "" ]; then
@@ -203,10 +203,10 @@ function flash_android
 
     # uboot or spl&bootloader
     if [ ${support_dual_bootloader} -eq 1 ]; then
-        bootloader_flashed_to_board="spl-imx8mq${uboot_feature}.bin"
-        uboot_proper_to_be_flashed="bootloader-imx8mq${uboot_feature}.img"
+        bootloader_flashed_to_board="spl-${soc_name}${uboot_feature}.bin"
+        uboot_proper_to_be_flashed="bootloader-${soc_name}${uboot_feature}.img"
     else
-        bootloader_flashed_to_board="u-boot-imx8mq${uboot_feature}.imx"
+        bootloader_flashed_to_board="u-boot-${soc_name}${uboot_feature}.imx"
     fi
 
     # in the source code, if AB slot feature is supported, uboot partition name is bootloader0, otherwise it's bootloader
@@ -356,7 +356,7 @@ temp_dir="/tmp/"
 # images when flash another set of images can not be detect early with this scenario.
 imx8mm_uboot_feature=(dual trusty-dual 4g-evk-uuu 4g ddr4-evk-uuu ddr4 evk-uuu trusty-4g trusty-secure-unlock trusty)
 imx8mn_uboot_feature=(dual trusty-dual evk-uuu trusty-secure-unlock trusty ddr4-evk-uuu ddr4)
-imx8mq_uboot_feature=(dual trusty-dual evk-uuu trusty-secure-unlock trusty)
+imx8mq_uboot_feature=(smarc_2g smarc_2g-dp trusty-smarc_2g trustu-dual-smarc_2g trusty-secure-unlock-smarc_2g smarc_4g smarc_4g-dp trusty-smarc_4g trustu-dual-smarc_4g trusty-secure-unlock-smarc_4g)
 smarcimx8mq_uboot_feature=(smarc_4g smarc_4g-uuu smarc_4g-trusty-secure-unlock smarc_4g-trusty smarc_2g smarc_2g-uuu smarc_2g-trusty-secure-unlock smarc_2g-trusty)
 imx8mp_uboot_feature=(dual trusty-dual evk-uuu trusty-secure-unlock trusty)
 imx8qxp_uboot_feature=(mek-uuu trusty-secure-unlock trusty secure-unlock c0 trusty-c0 mek-c0-uuu)
@@ -365,8 +365,7 @@ imx7ulp_uboot_feature=(evk-uuu)
 
 imx8mm_dtb_feature=(ddr4 m4 mipi-panel)
 imx8mn_dtb_feature=(mipi-panel rpmsg ddr4 ddr4-mipi-panel ddr4-rpmsg)
-imx8mq_dtb_feature=(dual mipi-panel mipi)
-smarcimx8mq_dtb_feature=(hdmi dcss-lvds lcdif-lvds dp dual-display)
+imx8mq_dtb_feature=(hdmi dcss-lvds lcdif-lvds dp dual-display)
 imx8mp_dtb_feature=(rpmsg hdmi lvds-panel lvds mipi-panel basler ov5640)
 imx8qxp_dtb_feature=()
 imx8qm_dtb_feature=(hdmi mipi-panel md xen)
diff --git a/scripts/sh/smarc-mkemmc.sh b/scripts/sh/smarc-mkemmc.sh
index a1cd645..a13a3fd 100755
--- a/scripts/sh/smarc-mkemmc.sh
+++ b/scripts/sh/smarc-mkemmc.sh
@@ -164,7 +164,7 @@ if [ "${soc_name}" = "imx8qxp" -o "${soc_name}" = "imx8qm" -o "${soc_name}" = "i
 fi
 
 # imx8mq chips and imx8mm chips, bootloader offset is 33KB on SD card
-if [ "${soc_name}" = "imx8mq" -o "${soc_name}" = "imx8mm" -o "${soc_name}" = "smarcimx8mq" ]; then
+if [ "${soc_name}" = "imx8mq" -o "${soc_name}" = "imx8mm" ]; then
     bootloader_offset=33
 fi
 
@@ -300,7 +300,7 @@ function flash_partition
             elif [ ${support_dtbo} -eq 1 ] && [ $(echo ${1} | grep "boot") != "" ] 2>/dev/null; then
                 img_name="boot.img"
             elif [ "$(echo ${1} | grep -E "dtbo|vbmeta|recovery")" != "" -a "${dtb_feature}" != "" ]; then
-                img_name="${1%_*}-${soc_name}${dtb_feature}.img"
+                img_name="${1%_*}-${soc_name}-smarc-${dtb_feature}.img"
             elif [ "$(echo ${1} | grep "super")" != "" ]; then
                 if [ ${dont_generate_super} -eq 0 ]; then
                     make_super_image
@@ -363,12 +363,12 @@ function flash_android
     gdisk -l ${node} 2>/dev/null | grep -q "super" && support_dynamic_partition=1
 
     if [ ${support_dual_bootloader} -eq 1 ]; then
-        bootloader_file=spl-imx8mq${uboot_feature}.bin
-        uboot_proper_file=bootloader-imx8mq${uboot_feature}.img
+        bootloader_file=spl-${soc_name}${uboot_feature}.bin
+        uboot_proper_file=bootloader-${soc_name}${uboot_feature}.img
         bootloader_partition="bootloader"${slot}
         flash_partition ${bootloader_partition} || exit 1
     else
-        bootloader_file=u-boot-imx8mq${uboot_feature}.imx
+        bootloader_file=u-boot-${soc_name}${uboot_feature}.imx
     fi
 
     if [ "${support_dtbo}" -eq "1" ] ; then
diff --git a/scripts/sh/smarc-mksdcard.sh b/scripts/sh/smarc-mksdcard.sh
index bfae799..2fcaf71 100755
--- a/scripts/sh/smarc-mksdcard.sh
+++ b/scripts/sh/smarc-mksdcard.sh
@@ -165,7 +165,7 @@ if [ "${soc_name}" = "imx8qxp" -o "${soc_name}" = "imx8qm" -o "${soc_name}" = "i
 fi
 
 # imx8mq chips and imx8mm chips, bootloader offset is 33KB on SD card
-if [ "${soc_name}" = "imx8mq" -o "${soc_name}" = "imx8mm" -o "${soc_name}" = "smarcimx8mq" ]; then
+if [ "${soc_name}" = "imx8mq" -o "${soc_name}" = "imx8mm" ]; then
     bootloader_offset=33
 fi
 
@@ -301,7 +301,7 @@ function flash_partition
             elif [ ${support_dtbo} -eq 1 ] && [ $(echo ${1} | grep "boot") != "" ] 2>/dev/null; then
                 img_name="boot.img"
             elif [ "$(echo ${1} | grep -E "dtbo|vbmeta|recovery")" != "" -a "${dtb_feature}" != "" ]; then
-                img_name="${1%_*}-${soc_name}${dtb_feature}.img"
+                img_name="${1%_*}-${soc_name}-smarc-${dtb_feature}.img"
             elif [ "$(echo ${1} | grep "super")" != "" ]; then
                 if [ ${dont_generate_super} -eq 0 ]; then
                     make_super_image
@@ -367,12 +367,12 @@ function flash_android
     gdisk -l ${node} 2>/dev/null | grep -q "super" && support_dynamic_partition=1
 
     if [ ${support_dual_bootloader} -eq 1 ]; then
-        bootloader_file=spl-imx8mq${uboot_feature}.bin
-        uboot_proper_file=bootloader-imx8mq${uboot_feature}.img
+        bootloader_file=spl-${soc_name}${uboot_feature}.bin
+        uboot_proper_file=bootloader-${soc_name}${uboot_feature}.img
         bootloader_partition="bootloader"${slot}
         flash_partition ${bootloader_partition} || exit 1
     else
-        bootloader_file=u-boot-imx8mq${uboot_feature}.imx
+        bootloader_file=u-boot-${soc_name}${uboot_feature}.imx
     fi
 
     if [ "${support_dtbo}" -eq "1" ] ; then