Clean up MALI driver integration

- Can only be built as module - Enabled via defconfig, not hardwired in the target architecture - Rename CONFIG_GPU_MALI to CONFIG_MALI
iainb · Jun 6, 2012 · 882b892 · 882b892
1 parent 2d46c99
commit 882b892
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 12 deletions.
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
@@ -625,7 +625,6 @@ config ARCH_SUN4I
 	select GENERIC_CLOCKEVENTS
 	select ARCH_HAS_CPUFREQ
 	select ARM_L1_CACHE_SHIFT_6
-	select GPU_MALI
 	help
 	  This enables support for Allwinner Technology Co., Ltd A10 SoC based systems
 

diff --git a/arch/arm/configs/sun4i_crane_defconfig b/arch/arm/configs/sun4i_crane_defconfig
@@ -1492,6 +1492,7 @@ CONFIG_PA_CONFIG=y
 #
 # CONFIG_DRM is not set
 # CONFIG_ION is not set
+CONFIG_MALI=m
 # CONFIG_VGASTATE is not set
 # CONFIG_VIDEO_OUTPUT_CONTROL is not set
 CONFIG_FB=y

diff --git a/arch/arm/configs/sun4i_defconfig b/arch/arm/configs/sun4i_defconfig
@@ -1148,6 +1148,7 @@ CONFIG_PA_CONFIG=y
 #
 # CONFIG_DRM is not set
 # CONFIG_ION is not set
+CONFIG_MALI=m
 # CONFIG_VGASTATE is not set
 # CONFIG_VIDEO_OUTPUT_CONTROL is not set
 CONFIG_FB=y

diff --git a/arch/arm/configs/sun5i_defconfig b/arch/arm/configs/sun5i_defconfig
@@ -996,6 +996,7 @@ CONFIG_PA_CONFIG=y
 #
 # CONFIG_DRM is not set
 # CONFIG_ION is not set
+CONFIG_MALI=m
 # CONFIG_VGASTATE is not set
 # CONFIG_VIDEO_OUTPUT_CONTROL is not set
 CONFIG_FB=y

diff --git a/drivers/Kconfig b/drivers/Kconfig
@@ -129,6 +129,4 @@ source "drivers/hwspinlock/Kconfig"
 
 source "drivers/clocksource/Kconfig"
 
-source "drivers/gpu/Kconfig"
-
 endmenu
diff --git a/drivers/gpu/Kconfig b/drivers/gpu/Kconfig
diff --git a/drivers/gpu/mali/Kconfig b/drivers/gpu/mali/Kconfig
@@ -1,6 +1,6 @@
-config GPU_MALI
-	boolean "ARM Mali GPU modules"
-	depends on ARM
+config MALI
+	tristate "ARM Mali GPU modules"
+	depends on ARM && m
 	default n
 	help
 	  This enables the generation of mali.ko and ump.ko.
diff --git a/drivers/gpu/mali/Makefile b/drivers/gpu/mali/Makefile
@@ -7,4 +7,4 @@ BUILD:=release
 TARGET_PLATFORM:=mali400-pmu
 export CONFIG USING_MMU USING_UMP USING_PMM BUILD TARGET_PLATFORM
 
-obj-$(CONFIG_GPU_MALI) += ump/ mali/
+obj-$(CONFIG_MALI) += ump/ mali/
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
@@ -25,6 +25,8 @@ source "drivers/gpu/stub/Kconfig"
 
 source "drivers/gpu/ion/Kconfig"
 
+source "drivers/gpu/mali/Kconfig"
+
 config VGASTATE
        tristate
        default n