aboutsummaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorGuillaume Tucker <guillaume.tucker@arm.com>2015-08-04 10:46:04 +0100
committerRyan Harkin <ryan.harkin@linaro.org>2017-05-10 14:13:55 +0100
commit01d92e27d503dfd37bb4d6c822d4fb3cd602fb2c (patch)
tree6f8c64aec3c27f8e2a00a833406e8cdfc5590d58 /drivers
parent8d0b605170b3242200b005a2041056f5ba8a784e (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 e9ed439a5b65..66386b42a1f4 100644
--- a/drivers/gpu/Makefile
+++ b/drivers/gpu/Makefile
@@ -2,5 +2,5 @@
# taken to initialize them in the correct order. Link order is the only way
# to ensure this currently.
obj-$(CONFIG_TEGRA_HOST1X) += host1x/
-obj-y += drm/ vga/
+obj-y += drm/ vga/ arm/
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 e0606c01e8ac..f85b18d6d6ff 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"
source "drivers/gpu/drm/Kconfig"