diff options
| author | Sidath Senanayake <sidaths@google.com> | 2021-07-12 20:18:46 +0100 |
|---|---|---|
| committer | Sidath Senanayake <sidaths@google.com> | 2021-07-12 20:18:46 +0100 |
| commit | f573fd96c0d6b6dfb2a91605a211dd15cb3153d4 (patch) | |
| tree | ab706afb1df5131b258a6ff01ed25cdd7bd16825 /mali_kbase/Makefile | |
| parent | d31cf595e359c7bde5c272f5b729c86277148e52 (diff) | |
| parent | fca8613cfcf585bf9113dca96a05daea9fd89794 (diff) | |
| download | gpu-f573fd96c0d6b6dfb2a91605a211dd15cb3153d4.tar.gz | |
Merge r31p0 from upstream into android-gs-pixel-5.10
This commit updates the Mali KMD to version r31p0 from
commit fca8613cfcf585bf9113dca96a05daea9fd89794
Bug: 185900681
Signed-off-by: Sidath Senanayake <sidaths@google.com>
Change-Id: I3c814b6145b10beee3d0fecedb74a6225a09a858
Diffstat (limited to 'mali_kbase/Makefile')
| -rw-r--r-- | mali_kbase/Makefile | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/mali_kbase/Makefile b/mali_kbase/Makefile index 01f93c9..c78d023 100644 --- a/mali_kbase/Makefile +++ b/mali_kbase/Makefile @@ -42,7 +42,7 @@ export CONFIG_MALI_DEVFREQ?=y endif DEFINES += -DCONFIG_MALI_MIDGARD=$(CONFIG_MALI_MIDGARD) \ - -DCONFIF_MALI_CSF_SUPPORT=$(CONFIF_MALI_CSF_SUPPORT) \ + -DCONFIG_MALI_CSF_SUPPORT=$(CONFIG_MALI_CSF_SUPPORT) \ -DCONFIG_MALI_KUTF=$(CONFIG_MALI_KUTF) \ -DCONFIG_MALI_REAL_HW=$(CONFIG_MALI_REAL_HW) \ -DCONFIG_MALI_GATOR_SUPPORT=$(CONFIG_MALI_GATOR_SUPPORT) \ @@ -62,14 +62,8 @@ export CONFIG_MALI_PIXEL_GPU_SECURE_RENDERING=y endif endif -BUSLOG_PATH_RELATIVE = $(M)/../../../.. KBASE_PATH_RELATIVE = $(M) -ifeq ($(CONFIG_MALI_BUSLOG),y) -#Add bus logger symbols -EXTRA_SYMBOLS += $(BUSLOG_PATH_RELATIVE)/drivers/base/bus_logger/Module.symvers -endif - # we get the symbols from modules using KBUILD_EXTRA_SYMBOLS to prevent warnings about unknown functions modules: $(MAKE) -C $(KDIR) M=$(M) W=1 EXTRA_CFLAGS="-I$(M) -I$(M)/../common/include -I$(M)/../../../../tests/include $(SCONS_CFLAGS)" $(SCONS_CONFIGS) KBUILD_EXTRA_SYMBOLS="$(EXTRA_SYMBOLS)" modules $(@) |