diff options
| author | Magnus Wendt <magnus.wendt@stericsson.com> | 2011-05-19 17:09:50 +0200 |
|---|---|---|
| committer | Ulf Hansson <ulf.hansson@stericsson.com> | 2011-09-19 16:05:55 +0200 |
| commit | bde6604e08a7a535d2bddac537f4a45eee8baf98 (patch) | |
| tree | 7ba21b21be4406076cc7f7615825fa9ed26a0e8a /drivers/gpu | |
| parent | b08b255cc4d057517887bda8cfcd18665b4d1a85 (diff) | |
ux500: drivers/gpu/mali: Updated mali build
The mali device driver git is now checked out in the
driver/gpu/mali/mali400ko folder. This commit adds a .gitignore for
this folder and updates relevant Makefiles and Kconfig.
ST-Ericsson ID: CR335265, CR341392
ST-Ericsson FOSS-OUT ID: Trivial
Change-Id: I6611a744fdc0fa132aa72ef83a1dd2523a398f91
Signed-off-by: Magnus Wendt <magnus.wendt@stericsson.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/29945
Reviewed-by: Robert FEKETE <robert.fekete@stericsson.com>
Tested-by: Robert FEKETE <robert.fekete@stericsson.com>
Reviewed-by: Ushit KUMAR <ushit.kumar@stericsson.com>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/Makefile | 5 | ||||
| -rw-r--r-- | drivers/gpu/mali/.gitignore | 1 | ||||
| -rw-r--r-- | drivers/gpu/mali/Kconfig | 8 | ||||
| -rw-r--r-- | drivers/gpu/mali/Makefile | 9 | ||||
| l--------- | drivers/gpu/mali/src | 1 |
5 files changed, 18 insertions, 6 deletions
diff --git a/drivers/gpu/Makefile b/drivers/gpu/Makefile index b57aa5499d1..d3ecf1f32ec 100644 --- a/drivers/gpu/Makefile +++ b/drivers/gpu/Makefile @@ -1,4 +1 @@ -obj-y += drm/ vga/ stub/ ion/ -ifeq ($(CONFIG_GPU_MALI), y) - obj-$(CONFIG_GPU_MALI) += mali/ -endif +obj-y += drm/ vga/ mali/ diff --git a/drivers/gpu/mali/.gitignore b/drivers/gpu/mali/.gitignore new file mode 100644 index 00000000000..73e24d4f3f3 --- /dev/null +++ b/drivers/gpu/mali/.gitignore @@ -0,0 +1 @@ +mali400ko diff --git a/drivers/gpu/mali/Kconfig b/drivers/gpu/mali/Kconfig index 978355d696f..0781bcbd854 100644 --- a/drivers/gpu/mali/Kconfig +++ b/drivers/gpu/mali/Kconfig @@ -5,3 +5,11 @@ config GPU_MALI This enables support for the ARM Mali 200/300/400 family of GPUs. Platform specific configuration is made in configuration files in the drivers/gpu/mali/src folder + +config GPU_MALI_DEBUG + boolean "Debug mode (required for instrumentation)" + default y + depends on GPU_MALI + ---help--- + This enables debug prints in the mali device driver. Debug mode must be + enabled in order to use the intrumentation feature of the mali libraries. diff --git a/drivers/gpu/mali/Makefile b/drivers/gpu/mali/Makefile index 79cfc8a5da2..d5b0b789beb 100644 --- a/drivers/gpu/mali/Makefile +++ b/drivers/gpu/mali/Makefile @@ -1 +1,8 @@ -obj-$(CONFIG_GPU_MALI) += src/ +MALI_SUBFOLDER := mali400ko/driver/src/devicedrv/mali +MALI_FOLDER := $(srctree)/$(src)/$(MALI_SUBFOLDER) +ifeq ($(shell [ -d $(MALI_FOLDER) ] && echo "OK"), OK) +obj-$(CONFIG_GPU_MALI) += $(MALI_SUBFOLDER)/ +else +$(warning WARNING: mali: Could not find $(MALI_FOLDER) - mali device driver will not be built) +obj-n += ./ +endif diff --git a/drivers/gpu/mali/src b/drivers/gpu/mali/src deleted file mode 120000 index bd5157f132d..00000000000 --- a/drivers/gpu/mali/src +++ /dev/null @@ -1 +0,0 @@ -../../../../vendor/st-ericsson/multimedia/linux/mali400ko/driver/src/devicedrv/mali/
\ No newline at end of file |