diff options
| author | Guillaume Tucker <guillaume.tucker@arm.com> | 2015-08-04 10:46:04 +0100 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2015-09-09 21:46:26 +0300 |
| commit | 06e805d81023fdc50fbc081b8683cffc72c3cb5e (patch) | |
| tree | e087f7278993dba874ff1642e2b4720ab997871b | |
| parent | 57998dfd26fe3cfe3815196a4b10740b28bd3381 (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>
| -rw-r--r-- | drivers/gpu/Makefile | 5 | ||||
| -rw-r--r-- | drivers/gpu/arm/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/video/Kconfig | 1 |
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/Makefile b/drivers/gpu/Makefile index e9ed439a5b65..7699cc1a42a2 100644 --- a/drivers/gpu/Makefile +++ b/drivers/gpu/Makefile @@ -1,6 +1,3 @@ -# drm/tegra depends on host1x, so if both drivers are built-in care must be -# 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 100644 --- 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 49fcbb1632af..4e9919b8e0a3 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" |