Introduce qcom_defs and inherit from it
Split Qualcomm definitions to a separate makefile for convenience,
as it will allow to have those defs set beforehand in other places.
Change-Id: I6910b47563f5fef370031d68e8c9d62311da1746
diff --git a/BoardConfigQcom.mk b/BoardConfigQcom.mk
index 0e9a285..2608903 100644
--- a/BoardConfigQcom.mk
+++ b/BoardConfigQcom.mk
@@ -1,31 +1,12 @@
include hardware/qcom-caf/common/qcom_boards.mk
+include hardware/qcom-caf/common/qcom_defs.mk
-# Platform names
-KONA := kona #SM8250
-LITO := lito #SM7250
-BENGAL := bengal #SM6115
-MSMNILE := msmnile #SM8150
-MSMSTEPPE := sm6150
-TRINKET := trinket #SM6125
-ATOLL := atoll #SM6250
-LAHAINA := lahaina #SM8350
-HOLI := holi #SM4350
-TARO := taro #SM8450
-PARROT := parrot #SM6450
-KALAMA := kalama #SM8550
-
-UM_3_18_FAMILY := msm8996
-UM_4_4_FAMILY := msm8998
-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_5_10_FAMILY := $(TARO) $(PARROT)
-UM_5_15_FAMILY := $(KALAMA)
+UM_3_18_HAL_FAMILY := msm8996
+UM_4_4_HAL_FAMILY := msm8998
ifeq (,$(TARGET_ENFORCES_QSSI))
-UM_3_18_FAMILY += msm8937 msm8953
-UM_4_4_FAMILY += sdm660
+UM_3_18_HAL_FAMILY += msm8937 msm8953
+UM_4_4_HAL_FAMILY += sdm660
else
UM_4_9_LEGACY_FAMILY := msm8937 msm8953
UM_4_19_LEGACY_FAMILY := sdm660
@@ -33,9 +14,7 @@
UM_PLATFORMS := \
$(UM_3_18_FAMILY) \
- $(UM_4_9_LEGACY_FAMILY) \
$(UM_4_4_FAMILY) \
- $(UM_4_19_LEGACY_FAMILY) \
$(UM_4_9_FAMILY) \
$(UM_4_14_FAMILY) \
$(UM_4_19_FAMILY) \
@@ -44,8 +23,8 @@
$(UM_5_15_FAMILY)
LEGACY_UM_PLATFORMS := \
- msm8937 msm8953 msm8996 \
- msm8998 sdm660 \
+ $(UM_3_18_FAMILY) \
+ $(UM_4_4_FAMILY) \
$(UM_4_9_FAMILY) \
$(UM_4_14_FAMILY) \
$(UM_4_19_FAMILY) \
@@ -161,14 +140,14 @@
TARGET_GRALLOC_HANDLE_HAS_RESERVED_SIZE ?= true
endif
-ifneq ($(filter $(UM_3_18_FAMILY),$(TARGET_BOARD_PLATFORM)),)
- MSM_VIDC_TARGET_LIST := $(UM_3_18_FAMILY)
+ifneq ($(filter $(UM_3_18_HAL_FAMILY),$(TARGET_BOARD_PLATFORM)),)
+ MSM_VIDC_TARGET_LIST := $(UM_3_18_HAL_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)
+else ifneq ($(filter $(UM_4_4_HAL_FAMILY),$(TARGET_BOARD_PLATFORM)),)
+ MSM_VIDC_TARGET_LIST := $(UM_4_4_HAL_FAMILY)
QCOM_HARDWARE_VARIANT := msm8998
else ifneq ($(filter $(UM_4_19_LEGACY_FAMILY),$(TARGET_BOARD_PLATFORM)),)
MSM_VIDC_TARGET_LIST := $(UM_4_19_LEGACY_FAMILY)
diff --git a/qcom_boards.mk b/qcom_boards.mk
index 33b6ecb..3266172 100644
--- a/qcom_boards.mk
+++ b/qcom_boards.mk
@@ -1,40 +1,37 @@
# Board platforms lists to be used for
# TARGET_BOARD_PLATFORM specific featurization
-# Platform name variables - used in makefiles everywhere
-KONA := kona #SM8250
-LITO := lito #SM7250
-BENGAL := bengal #SM6115
-MSMNILE := msmnile #SM8150
-MSMSTEPPE := sm6150
-TRINKET := trinket #SM6125
-ATOLL := atoll #SM6250
-LAHAINA := lahaina #SM8350
-HOLI := holi #SM4350
-TARO := taro #SM8450
-PARROT := parrot #SM6450
-KALAMA := kalama #SM8550
-
-# UM Family
+# UM 3.18
QCOM_BOARD_PLATFORMS += msm8937
QCOM_BOARD_PLATFORMS += msm8953
QCOM_BOARD_PLATFORMS += msm8996
+# UM 4.4
QCOM_BOARD_PLATFORMS += msm8998
QCOM_BOARD_PLATFORMS += sdm660
+# UM 4.9
QCOM_BOARD_PLATFORMS += sdm710
QCOM_BOARD_PLATFORMS += sdm845
-QCOM_BOARD_PLATFORMS += $(KONA)
-QCOM_BOARD_PLATFORMS += $(LITO)
-QCOM_BOARD_PLATFORMS += $(BENGAL)
-QCOM_BOARD_PLATFORMS += $(TRINKET)
-QCOM_BOARD_PLATFORMS += $(MSMSTEPPE)
-QCOM_BOARD_PLATFORMS += $(MSMNILE)
-QCOM_BOARD_PLATFORMS += $(ATOLL)
-QCOM_BOARD_PLATFORMS += $(LAHAINA)
-QCOM_BOARD_PLATFORMS += $(HOLI)
-QCOM_BOARD_PLATFORMS += $(TARO)
-QCOM_BOARD_PLATFORMS += $(PARROT)
-QCOM_BOARD_PLATFORMS += $(KALAMA)
+# UM 4.14
+QCOM_BOARD_PLATFORMS += msmnile
+QCOM_BOARD_PLATFORMS += sm6150
+QCOM_BOARD_PLATFORMS += trinket
+QCOM_BOARD_PLATFORMS += atoll
+
+# UM 4.19
+QCOM_BOARD_PLATFORMS += kona
+QCOM_BOARD_PLATFORMS += lito
+QCOM_BOARD_PLATFORMS += bengal
+
+# UM 5.4
+QCOM_BOARD_PLATFORMS += lahaina
+QCOM_BOARD_PLATFORMS += holi
+
+# UM 5.10
+QCOM_BOARD_PLATFORMS += taro
+QCOM_BOARD_PLATFORMS += parrot
+
+# UM 5.15
+QCOM_BOARD_PLATFORMS += kalama
diff --git a/qcom_defs.mk b/qcom_defs.mk
new file mode 100644
index 0000000..3df2ac4
--- /dev/null
+++ b/qcom_defs.mk
@@ -0,0 +1,13 @@
+# Platform name variables - used in makefiles everywhere
+MSMSTEPPE := sm6150
+TRINKET := trinket #SM6125
+
+# UM families
+UM_3_18_FAMILY := msm8996 msm8937 msm8953
+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_5_10_FAMILY := taro parrot
+UM_5_15_FAMILY := kalama