diff options
| author | Siddharth Kapoor <ksiddharth@google.com> | 2022-09-14 00:28:28 -0700 |
|---|---|---|
| committer | Lucas Wei <lucaswei@google.com> | 2022-10-12 21:38:16 +0800 |
| commit | 0ba2568460e6fecfa6397497062ba2cad01bf0d6 (patch) | |
| tree | 2135f8619ae03812df646decbeb2fbfd4e796481 /mali_kbase/Makefile | |
| parent | 3e113417ce636b5d978d80d93df44ab1389ef7d3 (diff) | |
| download | gpu-0ba2568460e6fecfa6397497062ba2cad01bf0d6.tar.gz | |
mali_kbase: Merge gs101 and gs201 builds
Refactor driver builds to support common codes for gs101 and gs201.
- Check SoC specific CONFIG flag in Kbuild
- Convert CONFIG_MALI_PIXEL_GPU_SSCD and
CONFIG_MALI_HOST_CONTROLS_SC_RAILS to ccflags
Bug: 245742922
Test: Not fully tested. DO NOT MERGE
Change-Id: I1cf7c19e2a2e63de17153c70ede806dc773398d3
Signed-off-by: Siddharth Kapoor <ksiddharth@google.com>
Signed-off-by: Lucas Wei <lucaswei@google.com>
Diffstat (limited to 'mali_kbase/Makefile')
| -rw-r--r-- | mali_kbase/Makefile | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/mali_kbase/Makefile b/mali_kbase/Makefile index 97bfcbd..f64f568 100644 --- a/mali_kbase/Makefile +++ b/mali_kbase/Makefile @@ -36,9 +36,6 @@ endif # Core kbase configuration options CONFIG_MALI_EXPERT=y CONFIG_MALI_MIDGARD_DVFS=y -ifneq ($(CONFIG_SOC_GS101),y) -CONFIG_MALI_CSF_SUPPORT=y -endif # Pixel integration specific configuration options CONFIG_MALI_PLATFORM_NAME="pixel" @@ -46,10 +43,6 @@ CONFIG_MALI_PIXEL_GPU_QOS ?= y CONFIG_MALI_PIXEL_GPU_BTS ?= y CONFIG_MALI_PIXEL_GPU_SECURE_RENDERING ?= y CONFIG_MALI_PIXEL_GPU_THERMAL ?= y -ifeq ($(CONFIG_MALI_CSF_SUPPORT),y) -CONFIG_MALI_PIXEL_GPU_SSCD ?= y -endif -CONFIG_MALI_HOST_CONTROLS_SC_RAILS ?= n # # Default configuration values @@ -144,7 +137,6 @@ ifeq ($(CONFIG_MALI_MIDGARD),m) CONFIG_MALI_ERROR_INJECT = n CONFIG_MALI_HW_ERRATA_1485982_NOT_AFFECTED = n CONFIG_MALI_HW_ERRATA_1485982_USE_CLOCK_ALTERNATIVE = n - CONFIG_MALI_HOST_CONTROLS_SC_RAILS = n CONFIG_MALI_PRFCNT_SET_SELECT_VIA_DEBUG_FS = n CONFIG_MALI_DEBUG = n CONFIG_MALI_MIDGARD_ENABLE_TRACE = n @@ -181,7 +173,6 @@ endif # All Mali CONFIG should be listed here CONFIGS := \ CONFIG_MALI_MIDGARD \ - CONFIG_MALI_CSF_SUPPORT \ CONFIG_MALI_GATOR_SUPPORT \ CONFIG_MALI_DMA_FENCE \ CONFIG_MALI_ARBITER_SUPPORT \ @@ -205,7 +196,6 @@ CONFIGS := \ CONFIG_MALI_ERROR_INJECT \ CONFIG_MALI_HW_ERRATA_1485982_NOT_AFFECTED \ CONFIG_MALI_HW_ERRATA_1485982_USE_CLOCK_ALTERNATIVE \ - CONFIG_MALI_HOST_CONTROLS_SC_RAILS \ CONFIG_MALI_PRFCNT_SET_PRIMARY \ CONFIG_MALI_PRFCNT_SET_SECONDARY \ CONFIG_MALI_PRFCNT_SET_TERTIARY \ @@ -224,8 +214,7 @@ CONFIGS += \ CONFIG_MALI_PIXEL_GPU_QOS \ CONFIG_MALI_PIXEL_GPU_BTS \ CONFIG_MALI_PIXEL_GPU_THERMAL \ - CONFIG_MALI_PIXEL_GPU_SECURE_RENDERING \ - CONFIG_MALI_PIXEL_GPU_SSCD + CONFIG_MALI_PIXEL_GPU_SECURE_RENDERING # |