From c3c74bc3c32cbaf72ae64e5a6520379d05ad3225 Mon Sep 17 00:00:00 2001
From: Eric Lee <eric.lee@embedian.com>
Date: Mon, 6 Dec 2021 18:44:37 +0800
Subject: [PATCH] Fix the name typo

---
 imx8m/smarc_mx8mq/.BoardConfig.mk.swp            | Bin 0 -> 16384 bytes
 imx8m/smarc_mx8mq/smarc_mx8mq_drm.mk             |  17 ++++++++---------
 imx8m/smarc_mx8mq/uuu/uuu_android_smarc_flash.sh |   8 ++------
 3 files changed, 10 insertions(+), 15 deletions(-)
 create mode 100644 imx8m/smarc_mx8mq/.BoardConfig.mk.swp

diff --git a/imx8m/smarc_mx8mq/.BoardConfig.mk.swp b/imx8m/smarc_mx8mq/.BoardConfig.mk.swp
new file mode 100644
index 0000000000000000000000000000000000000000..0a250187e7f7653f4442c6cc176a8ad20c52a196
GIT binary patch
literal 16384
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

literal 0
HcmV?d00001

diff --git a/imx8m/smarc_mx8mq/smarc_mx8mq_drm.mk b/imx8m/smarc_mx8mq/smarc_mx8mq_drm.mk
index bc630fa..9130046 100644
--- a/imx8m/smarc_mx8mq/smarc_mx8mq_drm.mk
+++ b/imx8m/smarc_mx8mq/smarc_mx8mq_drm.mk
@@ -16,8 +16,8 @@ PRODUCT_COPY_FILES += \
 $(call inherit-product, $(TOPDIR)device/embedian/imx8m/optee-packages.mk)
 $(call inherit-product, $(TOPDIR)$(IMX_DEVICE_PATH)/smarc_mx8mq.mk)
 
-TARGET_KERNEL_DEFCONFIG := smarcimx8m_android_defconfig
-
+TARGET_KERNEL_DEFCONFIG := imx_v8_android_defconfig
+TARGET_KERNEL_ADDITION_DEFCONF := android_addition_defconfig
 
 # Overrides
 PRODUCT_NAME := smarc_mx8mq_drm
@@ -38,13 +38,12 @@ endif
 endif
 
 TARGET_BOARD_DTS_CONFIG := \
-        smarcimx8mq-dcss-lvds:imx8mq-smarc-dcss-lvds.dtb \
-        smarcimx8mq-dp:imx8mq-smarc-dp.dtb \
-        smarcimx8mq:imx8mq-smarc-drm.dtb \
-        smarcimx8mq-dual-display:imx8mq-smarc-dual-display.dtb \
-        smarcimx8mq-edp:imx8mq-smarc-edp.dtb \
-        smarcimx8mq-lcdif-lvds:imx8mq-smarc-lcdif-lvds.dtb \
-        smarcimx8mq-hdmi:imx8mq-smarc-hdmi.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
 
 # Exoplayer
 PRODUCT_PACKAGES += \
diff --git a/imx8m/smarc_mx8mq/uuu/uuu_android_smarc_flash.sh b/imx8m/smarc_mx8mq/uuu/uuu_android_smarc_flash.sh
index 47ebf04..1a11e7b 100755
--- a/imx8m/smarc_mx8mq/uuu/uuu_android_smarc_flash.sh
+++ b/imx8m/smarc_mx8mq/uuu/uuu_android_smarc_flash.sh
@@ -62,10 +62,7 @@ options:
                            ├────────────────┼──────────────────────────────────────────────────────────────────────────────────────────────────────┤
                            │   imx8mn       │  mipi-panel rpmsg ddr4 ddr4-mipi-panel ddr4-rpmsg                                                    │
                            ├────────────────┼──────────────────────────────────────────────────────────────────────────────────────────────────────┤
-                           │   imx8mq       │  dual mipi-panel mipi                                                                                │
-                           ├────────────────┼──────────────────────────────────────────────────────────────────────────────────────────────────────┤
-───────────────────────────────────────────────────────────────────┤
-                           │   smarcimx8mq  │  hdmi dp dcss-lvds lcdif-lvds dual-display                                                           │
+                           │   imx8mq       │  hdmi dp dcss-lvds lcdif-lvds dual-display                                                           │
                            ├────────────────┼──────────────────────────────────────────────────────────────────────────────────────────────────────┤
                            │   imx8mp       │  rpmsg hdmi lvds-panel lvds mipi-panel basler ov5640                                                 │
                            ├────────────────┼──────────────────────────────────────────────────────────────────────────────────────────────────────┤
@@ -357,7 +354,6 @@ temp_dir="/tmp/"
 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=(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)
 imx8qm_uboot_feature=(mek-uuu trusty-secure-unlock trusty secure-unlock md hdmi)
@@ -372,7 +368,7 @@ imx8qm_dtb_feature=(hdmi mipi-panel md xen)
 imx7ulp_dtb_feature=(evk-mipi evk mipi)
 
 # an array to collect the supported soc_names
-supported_soc_names=(imx8qm imx8qxp imx8mq smarcimx8mq imx8mm imx8mn imx8mp imx7ulp)
+supported_soc_names=(imx8qm imx8qxp imx8mq imx8mm imx8mn imx8mp imx7ulp)
 
 if [ $# -eq 0 ]; then
     echo -e ${RED}no parameter specified, will directly exit after displaying help message${STD}
-- 
1.9.1