QCOM: RIP pre-UM families
Change-Id: I36e88d74928303ef13334e5feb3d4d3a98c25bd3
diff --git a/build/core/vendor/qcom_boards.mk b/build/core/vendor/qcom_boards.mk
index f67091a..b4a9906 100644
--- a/build/core/vendor/qcom_boards.mk
+++ b/build/core/vendor/qcom_boards.mk
@@ -12,30 +12,6 @@
LAHAINA ?= lahaina #SM8350
HOLI ?= holi #SM4350
-# A Family
-QCOM_BOARD_PLATFORMS += msm7x27a
-QCOM_BOARD_PLATFORMS += msm7x30
-QCOM_BOARD_PLATFORMS += msm8660
-
-QCOM_BOARD_PLATFORMS += msm8960
-
-# B Family
-QCOM_BOARD_PLATFORMS += msm8226
-QCOM_BOARD_PLATFORMS += msm8610
-QCOM_BOARD_PLATFORMS += msm8974
-
-QCOM_BOARD_PLATFORMS += apq8084
-
-# B64 Family
-QCOM_BOARD_PLATFORMS += msm8992
-QCOM_BOARD_PLATFORMS += msm8994
-
-# BR Family
-QCOM_BOARD_PLATFORMS += msm8909
-QCOM_BOARD_PLATFORMS += msm8916
-
-QCOM_BOARD_PLATFORMS += msm8952
-
# UM Family
QCOM_BOARD_PLATFORMS += msm8937
QCOM_BOARD_PLATFORMS += msm8953
diff --git a/config/BoardConfigQcom.mk b/config/BoardConfigQcom.mk
index 5f5870a..6d6febc 100644
--- a/config/BoardConfigQcom.mk
+++ b/config/BoardConfigQcom.mk
@@ -9,9 +9,6 @@
LAHAINA ?= lahaina #SM8350
HOLI ?= holi #SM4350
-B_FAMILY := msm8226 msm8610 msm8974
-B64_FAMILY := msm8992 msm8994
-BR_FAMILY := msm8909 msm8916
UM_3_18_FAMILY := msm8937 msm8996
UM_4_4_FAMILY := msm8998 sdm660
UM_4_9_FAMILY := sdm845 sdm710
@@ -54,31 +51,17 @@
SOONG_CONFIG_qtidisplay_udfps ?= false
SOONG_CONFIG_qtidisplay_default ?= true
-# UM platforms no longer need this set on O+
-ifneq ($(filter $(B_FAMILY) $(B64_FAMILY) $(BR_FAMILY),$(TARGET_BOARD_PLATFORM)),)
- TARGET_USES_QCOM_BSP := true
-endif
-
# Tell HALs that we're compiling an AOSP build with an in-line kernel
TARGET_COMPILE_WITH_MSM_KERNEL := true
-ifneq ($(filter msm7x27a msm7x30 msm8660 msm8960,$(TARGET_BOARD_PLATFORM)),)
- # Enable legacy audio functions
- ifeq ($(BOARD_USES_LEGACY_ALSA_AUDIO),true)
- USE_CUSTOM_AUDIO_POLICY := 1
- endif
-endif
-
# Enable media extensions
TARGET_USES_MEDIA_EXTENSIONS := true
# Allow building audio encoders
TARGET_USES_QCOM_MM_AUDIO := true
-# Enable color metadata for every UM platform
-ifneq ($(filter $(UM_PLATFORMS),$(TARGET_BOARD_PLATFORM)),)
- TARGET_USES_COLOR_METADATA := true
-endif
+# Enable color metadata
+TARGET_USES_COLOR_METADATA := true
# Enable DRM PP driver on UM platforms that support it
ifneq ($(filter $(UM_4_9_FAMILY) $(UM_4_14_FAMILY) $(UM_4_19_FAMILY) $(UM_5_4_FAMILY),$(TARGET_BOARD_PLATFORM)),)
@@ -93,11 +76,6 @@
TARGET_ADDITIONAL_GRALLOC_10_USAGE_BITS ?= 0
-# Mark GRALLOC_USAGE_HW_2D as valid gralloc bit on legacy platforms that support it
-ifneq ($(filter msm8960 msm8952 $(B_FAMILY) $(B64_FAMILY) $(BR_FAMILY),$(TARGET_BOARD_PLATFORM)),)
- TARGET_ADDITIONAL_GRALLOC_10_USAGE_BITS += | (1 << 10)
-endif
-
# Mark GRALLOC_USAGE_EXTERNAL_DISP as valid gralloc bit
TARGET_ADDITIONAL_GRALLOC_10_USAGE_BITS += | (1 << 13)
@@ -112,16 +90,7 @@
# List of targets that use master side content protection
MASTER_SIDE_CP_TARGET_LIST := msm8996 $(UM_4_4_FAMILY) $(UM_4_9_FAMILY) $(UM_4_14_FAMILY) $(UM_4_19_FAMILY)
-ifneq ($(filter $(B_FAMILY),$(TARGET_BOARD_PLATFORM)),)
- MSM_VIDC_TARGET_LIST := $(B_FAMILY)
- QCOM_HARDWARE_VARIANT := msm8974
-else ifneq ($(filter $(B64_FAMILY),$(TARGET_BOARD_PLATFORM)),)
- MSM_VIDC_TARGET_LIST := $(B64_FAMILY)
- QCOM_HARDWARE_VARIANT := msm8994
-else ifneq ($(filter $(BR_FAMILY),$(TARGET_BOARD_PLATFORM)),)
- MSM_VIDC_TARGET_LIST := $(BR_FAMILY)
- QCOM_HARDWARE_VARIANT := msm8916
-else ifneq ($(filter $(UM_3_18_FAMILY),$(TARGET_BOARD_PLATFORM)),)
+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_4_FAMILY),$(TARGET_BOARD_PLATFORM)),)