projects / platform / kernel / linux-exynos.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 0c6f96a)
gpu: arm: midgard: remove choice in Kconfig of r5p0_06rel0
authorJoonyoung Shim <jy0922.shim@samsung.com>
Thu, 19 May 2016 08:16:21 +0000 (17:16 +0900)
committerJoonyoung Shim <jy0922.shim@samsung.com>
Thu, 7 Jul 2016 06:39:24 +0000 (15:39 +0900)
The choice of each mali version causes Kconfig errors like below,

$ make ARCH=arm64 menuconfig
scripts/kconfig/mconf  Kconfig
drivers/gpu/arm/midgard/r12p0_02dev0/Kconfig:126:warning: choice value used outside its choice group
drivers/gpu/arm/midgard/r12p0_02dev0/Kconfig:129:warning: choice value used outside its choice group
drivers/gpu/arm/midgard/r12p0_02dev0/Kconfig:132:warning: choice value used outside its choice group
drivers/gpu/arm/midgard/r12p0_02dev0/Kconfig:135:warning: choice value used outside its choice group
drivers/gpu/arm/midgard/r12p0_02dev0/Kconfig:137:warning: choice value used outside its choice group

Also remove configs for unused platform.

Signed-off-by: Joonyoung Shim <jy0922.shim@samsung.com>
drivers/gpu/arm/midgard/r5p0_06rel0/Kconfig patch | blob | history

diff --git a/drivers/gpu/arm/midgard/r5p0_06rel0/Kconfig b/drivers/gpu/arm/midgard/r5p0_06rel0/Kconfig
index 9f1efc7..63461a3 100644 (file)
--- a/drivers/gpu/arm/midgard/r5p0_06rel0/Kconfig
+++ b/drivers/gpu/arm/midgard/r5p0_06rel0/Kconfig
@@ -100,28 +100,9 @@ config MALI_PLATFORM_FAKE
          supports creating the platform device outside of the Linux platform-specific code.
          Enable this option if would like to use a platform device configuration from within the device driver.
 
-choice
-       prompt "Platform configuration"
-       depends on MALI_MIDGARD && MALI_EXPERT
-       default MALI_PLATFORM_VEXPRESS
-       help
-         Select the SOC platform that contains a Mali Midgard GPU
-
-config MALI_PLATFORM_VEXPRESS
-       depends on ARCH_VEXPRESS && (ARCH_VEXPRESS_CA9X4 || ARCH_VEXPRESS_CA15X4)
-       bool "Versatile Express"
-config MALI_PLATFORM_VEXPRESS_VIRTEX7_40MHZ
-       depends on ARCH_VEXPRESS && (ARCH_VEXPRESS_CA9X4 || ARCH_VEXPRESS_CA15X4)
-       bool "Versatile Express w/Virtex7 @ 40Mhz"
-config MALI_PLATFORM_GOLDFISH
-       depends on ARCH_GOLDFISH
-       bool "Android Goldfish virtual CPU"
-config MALI_PLATFORM_PBX
-       depends on ARCH_REALVIEW && REALVIEW_EB_A9MP && MACH_REALVIEW_PBX
-       bool "Realview PBX-A9"
 config MALI_PLATFORM_THIRDPARTY
        bool "Third Party Platform"
-endchoice
+       depends on MALI_MIDGARD && MALI_EXPERT
 
 config MALI_PLATFORM_THIRDPARTY_NAME
        depends on MALI_MIDGARD && MALI_PLATFORM_THIRDPARTY && MALI_EXPERT
Domain: System / Kernel;