ODROID-C5: arm/gpu: fix to build ARM Mali GPU driver
Change-Id: Ia3c894e9b4ee32018082e90ca5fbe95c4ee73c87
Signed-off-by: Dongjin Kim <tobetter@gmail.com>
diff --git a/drivers/Kconfig b/drivers/Kconfig
index 66f3f90..1444b65 100644
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@ -64,4 +64,5 @@
source "$(COMMON_DRIVERS_DIR)/drivers/amfc/Kconfig"
source "$(COMMON_DRIVERS_DIR)/drivers/hid/Kconfig"
source "$(COMMON_DRIVERS_DIR)/scripts/Kconfig"
+source "$(COMMON_DRIVERS_DIR)/drivers/gpu/arm/Kconfig"
endmenu
diff --git a/drivers/Makefile b/drivers/Makefile
index da903ef..22339f9 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -63,6 +63,7 @@
obj-$(CONFIG_AMLOGIC_SECKEY) += seckey/
obj-$(CONFIG_AMLOGIC_USBCAM) += dvb_usbci/
obj-$(CONFIG_AMLOGIC_AMFC) += amfc/
+obj-$(CONFIG_MALI_MIDGARD) += gpu/arm/
KBUILD_CFLAGS_MODULE += $(GKI_EXT_KERNEL_MODULE_PREDEFINE)
all:
diff --git a/drivers/gpu/arm/Kconfig b/drivers/gpu/arm/Kconfig
index 2da8c98..e9ff182 100644
--- a/drivers/gpu/arm/Kconfig
+++ b/drivers/gpu/arm/Kconfig
@@ -19,5 +19,5 @@
#
menu "ARM GPU Configuration"
-source "drivers/gpu/arm/midgard/Kconfig"
+source "$(COMMON_DRIVERS_DIR)/drivers/gpu/arm/midgard/Kconfig"
endmenu
diff --git a/drivers/gpu/arm/Makefile b/drivers/gpu/arm/Makefile
index ea9ecc7..4f38433 100644
--- a/drivers/gpu/arm/Makefile
+++ b/drivers/gpu/arm/Makefile
@@ -18,4 +18,4 @@
#
#
-include midgard/Makefile
+include $(COMMON_DRIVERS_DIR)/gpu/arm/midgard/Makefile
diff --git a/drivers/gpu/arm/midgard/Kbuild b/drivers/gpu/arm/midgard/Kbuild
index dadc3e1..a24e2d0 100644
--- a/drivers/gpu/arm/midgard/Kbuild
+++ b/drivers/gpu/arm/midgard/Kbuild
@@ -120,8 +120,8 @@
-DMALI_RELEASE_NAME=$(MALI_RELEASE_NAME) \
-DMALI_JIT_PRESSURE_LIMIT_BASE=$(MALI_JIT_PRESSURE_LIMIT_BASE) \
-DMALI_INCREMENTAL_RENDERING_JM=$(MALI_INCREMENTAL_RENDERING_JM) \
- -DMALI_PLATFORM_DIR=$(MALI_PLATFORM_DIR)
-
+ -DMALI_PLATFORM_DIR=$(MALI_PLATFORM_DIR) \
+ -DCONFIG_MALI_LOW_MEM=0
ifeq ($(KBUILD_EXTMOD),)
# in-tree
@@ -145,7 +145,9 @@
# Kernel Modules
#
obj-$(CONFIG_MALI_MIDGARD) += mali_kbase.o
+ifneq ($(CONFIG_MALI_ARBITRATION),)
obj-$(CONFIG_MALI_ARBITRATION) += ../arbitration/
+endif
obj-$(CONFIG_MALI_KUTF) += tests/
mali_kbase-y := \
diff --git a/drivers/gpu/arm/midgard/Kconfig b/drivers/gpu/arm/midgard/Kconfig
index 701b68f..46398e9 100644
--- a/drivers/gpu/arm/midgard/Kconfig
+++ b/drivers/gpu/arm/midgard/Kconfig
@@ -48,7 +48,7 @@
def_bool !MALI_NO_MALI
menu "Platform specific options"
-source "drivers/gpu/arm/midgard/platform/Kconfig"
+source "$(COMMON_DRIVERS_DIR)/drivers/gpu/arm/midgard/platform/Kconfig"
endmenu
config MALI_CSF_SUPPORT
@@ -380,6 +380,6 @@
If unsure, say N.
-source "drivers/gpu/arm/midgard/tests/Kconfig"
+source "$(COMMON_DRIVERS_DIR)/drivers/gpu/arm/midgard/tests/Kconfig"
endif