diff options
| author | Vamsidhar reddy Gaddam <gvamsi@google.com> | 2023-12-20 12:42:26 +0000 |
|---|---|---|
| committer | Vamsidhar reddy Gaddam <gvamsi@google.com> | 2024-01-05 09:19:17 +0000 |
| commit | 11473542814286e59a89a70c969fb50a25ba921f (patch) | |
| tree | bd4aa60e7d3dc895d82a36fcea0026569e3a04aa /mali_kbase/Makefile | |
| parent | 8768eedce66a4373c96f35c8dfb73d4668703180 (diff) | |
| parent | 049a542207ed694271316782397b78b2e202086a (diff) | |
| download | gpu-11473542814286e59a89a70c969fb50a25ba921f.tar.gz | |
Merge branch 'upstream' into HEAD
Update KMD to R47P0
Bug: 315267052
Test: Outlined in go/pixel-gpu-kmd-r47p0
Change-Id: I89454c4c862033fe330b260a9bc6cc777a3ca231
Signed-off-by: Vamsidhar reddy Gaddam <gvamsi@google.com>
Diffstat (limited to 'mali_kbase/Makefile')
| -rw-r--r-- | mali_kbase/Makefile | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/mali_kbase/Makefile b/mali_kbase/Makefile index 34c91f4..beecca2 100644 --- a/mali_kbase/Makefile +++ b/mali_kbase/Makefile @@ -62,6 +62,7 @@ ifeq ($(MALI_KCONFIG_EXT_PREFIX),) CONFIG_MALI_GATOR_SUPPORT ?= y CONFIG_MALI_ARBITRATION ?= n CONFIG_MALI_PARTITION_MANAGER ?= n + CONFIG_MALI_64BIT_HW_ACCESS ?= n ifneq ($(CONFIG_MALI_NO_MALI),y) # Prevent misuse when CONFIG_MALI_NO_MALI=y @@ -122,10 +123,8 @@ ifeq ($(MALI_KCONFIG_EXT_PREFIX),) else # Prevent misuse when CONFIG_MALI_EXPERT=n CONFIG_MALI_CORESTACK = n - CONFIG_LARGE_PAGE_ALLOC_OVERRIDE = n - CONFIG_LARGE_PAGE_ALLOC = n + CONFIG_LARGE_PAGE_SUPPORT = y CONFIG_MALI_PWRSOFT_765 = n - CONFIG_MALI_MEMORY_FULLY_BACKED = n CONFIG_MALI_JOB_DUMP = n CONFIG_MALI_NO_MALI = n CONFIG_MALI_REAL_HW = y @@ -174,7 +173,7 @@ ifeq ($(MALI_KCONFIG_EXT_PREFIX),) endif # All Mali CONFIG should be listed here - CONFIGS := \ + CONFIGS += \ CONFIG_MALI_MIDGARD \ CONFIG_MALI_GATOR_SUPPORT \ CONFIG_MALI_ARBITER_SUPPORT \ @@ -187,10 +186,8 @@ ifeq ($(MALI_KCONFIG_EXT_PREFIX),) CONFIG_MALI_DMA_BUF_LEGACY_COMPAT \ CONFIG_MALI_EXPERT \ CONFIG_MALI_CORESTACK \ - CONFIG_LARGE_PAGE_ALLOC_OVERRIDE \ - CONFIG_LARGE_PAGE_ALLOC \ + CONFIG_LARGE_PAGE_SUPPORT \ CONFIG_MALI_PWRSOFT_765 \ - CONFIG_MALI_MEMORY_FULLY_BACKED \ CONFIG_MALI_JOB_DUMP \ CONFIG_MALI_NO_MALI \ CONFIG_MALI_ERROR_INJECT \ @@ -221,6 +218,7 @@ ifeq ($(MALI_KCONFIG_EXT_PREFIX),) CONFIG_MALI_PIXEL_GPU_SECURE_RENDERING \ CONFIG_MALI_PIXEL_GPU_SLC + endif THIS_DIR := $(dir $(lastword $(MAKEFILE_LIST))) @@ -259,7 +257,10 @@ endif # # KBUILD_EXTRA_SYMBOLS to prevent warnings about unknown functions # -EXTRA_SYMBOLS += $(OUT_DIR)/../google-modules/gpu/mali_pixel/Module.symvers +BASE_SYMBOLS = $(OUT_DIR)/../google-modules/gpu/mali_pixel/Module.symvers + +EXTRA_SYMBOLS += \ + $(BASE_SYMBOLS) CFLAGS_MODULE += -Wall -Werror |