From db865e60a09b5c2f2165551636d19c103cb405c2 Mon Sep 17 00:00:00 2001 From: Joonyoung Shim Date: Tue, 20 Jan 2015 11:45:04 +0900 Subject: [PATCH] gpu: arm: midgard: add build condition Modify Kconfig and Makefile for mali. Signed-off-by: Joonyoung Shim --- drivers/gpu/Makefile | 3 ++- drivers/video/Kconfig | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/Makefile b/drivers/gpu/Makefile index e9ed439a5b65..f003a010dfc4 100644 --- a/drivers/gpu/Makefile +++ b/drivers/gpu/Makefile @@ -1,6 +1,7 @@ # 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 += arm/ obj-y += drm/ vga/ +obj-$(CONFIG_TEGRA_HOST1X) += host1x/ obj-$(CONFIG_IMX_IPUV3_CORE) += ipu-v3/ diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index 8bf495ffb020..0ac53ab5498a 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig @@ -22,6 +22,8 @@ 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" endmenu -- 2.34.1