aboutsummaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorGuillaume Tucker <guillaume.tucker@arm.com>2015-08-04 10:46:04 +0100
committerJon Medhurst <tixy@linaro.org>2016-04-06 15:02:41 +0100
commit0ffad633d0fc1ad5b8b10266d98adbce9860a0c1 (patch)
tree9f54d1cc6f91efee26a15b33a308c36b0e870f1f /drivers
parent61532b9a2a7e1c0a21c6355e8c5b371fa2d45d19 (diff)
drivers/gpu: add ARM Mali driver to Kconfig and Kbuild
Add drivers/gpu/arm/midgard and drivers/base/ump to top-level Kconfig and Kbuild files. Signed-off-by: Guillaume Tucker <guillaume.tucker@arm.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/Makefile2
-rwxr-xr-xdrivers/gpu/arm/Kconfig2
-rw-r--r--drivers/video/Kconfig1
3 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/Makefile b/drivers/gpu/Makefile
index 70da9eb52a42..b6641febc830 100644
--- a/drivers/gpu/Makefile
+++ b/drivers/gpu/Makefile
@@ -1,3 +1,3 @@
-obj-y += drm/ vga/
+obj-y += drm/ vga/ arm/
obj-$(CONFIG_TEGRA_HOST1X) += host1x/
obj-$(CONFIG_IMX_IPUV3_CORE) += ipu-v3/
diff --git a/drivers/gpu/arm/Kconfig b/drivers/gpu/arm/Kconfig
index 1f30eb541d65..f6f84538f908 100755
--- a/drivers/gpu/arm/Kconfig
+++ b/drivers/gpu/arm/Kconfig
@@ -17,3 +17,5 @@
menu "ARM GPU Configuration"
source "drivers/gpu/arm/midgard/Kconfig"
endmenu
+
+source "drivers/base/ump/Kconfig"
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 8bf495ffb020..cf7600df3a59 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -21,6 +21,7 @@ source "drivers/gpu/vga/Kconfig"
source "drivers/gpu/host1x/Kconfig"
source "drivers/gpu/ipu-v3/Kconfig"
+source "drivers/gpu/arm/Kconfig"
menu "Direct Rendering Manager"
source "drivers/gpu/drm/Kconfig"