Split msm8937 from UM_3_18_FAMILY and fix it

Co-authored-by: Michael Bestas <mkbestas@gmail.com>
Change-Id: I06bf48ff8433cc00dbaaa0ee05b3b86c7af01821
Signed-off-by: Simão Gomes Viana <devel@superboring.dev>

config/BoardConfigQcom.mk

@@ -9,22 +9,43 @@ ATOLL := atoll #SM6250
 LAHAINA := lahaina #SM8350
 HOLI := holi #SM4350
 
-UM_3_18_FAMILY := msm8937 msm8996
+UM_3_18_FAMILY := msm8996
 UM_4_4_FAMILY := msm8998 sdm660
 UM_4_9_FAMILY := sdm845 sdm710
 UM_4_14_FAMILY := $(MSMNILE) $(MSMSTEPPE) $(TRINKET) $(ATOLL)
 UM_4_19_FAMILY := $(KONA) $(LITO) $(BENGAL)
 UM_5_4_FAMILY := $(LAHAINA) $(HOLI)
-UM_PLATFORMS := $(UM_3_18_FAMILY) $(UM_4_4_FAMILY) $(UM_4_9_FAMILY) $(UM_4_14_FAMILY) $(UM_4_19_FAMILY) $(UM_5_4_FAMILY)
-LEGACY_UM_PLATFORMS := msm8953 $(UM_3_18_FAMILY) $(UM_4_4_FAMILY) $(UM_4_9_FAMILY) $(UM_4_14_FAMILY) $(UM_4_19_FAMILY) $(UM_5_4_FAMILY)
-QSSI_SUPPORTED_PLATFORMS := $(UM_4_9_FAMILY) $(UM_4_14_FAMILY) $(UM_4_19_FAMILY) $(UM_5_4_FAMILY)
 
 ifeq (,$(TARGET_ENFORCES_QSSI))
-UM_3_18_FAMILY += msm8953
+UM_3_18_FAMILY += msm8937 msm8953
 else
-QSSI_SUPPORTED_PLATFORMS += msm8953
+UM_4_9_LEGACY_FAMILY := msm8937 msm8953
 endif
 
+UM_PLATFORMS := \
+    $(UM_3_18_FAMILY) \
+    $(UM_4_9_LEGACY_FAMILY) \
+    $(UM_4_4_FAMILY) \
+    $(UM_4_9_FAMILY) \
+    $(UM_4_14_FAMILY) \
+    $(UM_4_19_FAMILY) \
+    $(UM_5_4_FAMILY)
+
+LEGACY_UM_PLATFORMS := \
+    msm8937 msm8953 msm8996 \
+    $(UM_4_4_FAMILY) \
+    $(UM_4_9_FAMILY) \
+    $(UM_4_14_FAMILY) \
+    $(UM_4_19_FAMILY) \
+    $(UM_5_4_FAMILY)
+
+QSSI_SUPPORTED_PLATFORMS := \
+    $(UM_4_9_LEGACY_FAMILY) \
+    $(UM_4_9_FAMILY) \
+    $(UM_4_14_FAMILY) \
+    $(UM_4_19_FAMILY) \
+    $(UM_5_4_FAMILY)
+
 BOARD_USES_ADRENO := true
 
 # Add qtidisplay to soong config namespaces
@@ -89,6 +110,9 @@ MASTER_SIDE_CP_TARGET_LIST := msm8996 $(UM_4_4_FAMILY) $(UM_4_9_FAMILY) $(UM_4_1
 ifneq ($(filter $(UM_3_18_FAMILY),$(TARGET_BOARD_PLATFORM)),)
     MSM_VIDC_TARGET_LIST := $(UM_3_18_FAMILY)
     QCOM_HARDWARE_VARIANT := msm8996
+else ifneq ($(filter $(UM_4_9_LEGACY_FAMILY),$(TARGET_BOARD_PLATFORM)),)
+    MSM_VIDC_TARGET_LIST := $(UM_4_9_LEGACY_FAMILY)
+    QCOM_HARDWARE_VARIANT := msm8953
 else ifneq ($(filter $(UM_4_4_FAMILY),$(TARGET_BOARD_PLATFORM)),)
     MSM_VIDC_TARGET_LIST := $(UM_4_4_FAMILY)
     QCOM_HARDWARE_VARIANT := msm8998