mali: gpu: video: make the menu of midgard for linux visible

Although it is not allow to offer two config menu source at
the same time, but at lease we could tune some options of
it now.

Change-Id: I0b447876d13a0d5a95276cfe4600b6030f6b8529
Signed-off-by: ayaka <ayaka@soulik.info>
Signed-off-by: Randy Li <randy.li@rock-chips.com>

diff --git a/drivers/gpu/arm/Kbuild b/drivers/gpu/arm/Kbuild
index eb2a409853836020ed960a3f0aab7d14bb71b58e..3f1675ca0dfbb6c4d80e1472b3774de03e5e6ca3 100755 (executable)
--- a/drivers/gpu/arm/Kbuild
+++ b/drivers/gpu/arm/Kbuild
@@ -16,8 +16,6 @@
 
 obj-$(CONFIG_MALI_MIDGARD_FOR_LINUX) += midgard_for_linux/
 
-ifneq ($(CONFIG_MALI_MIDGARD_FOR_LINUX),y)
-obj-y += midgard/
-endif
+obj-$(CONFIG_MALI_MIDGARD_FOR_ANDROID) += midgard/
 
 obj-$(CONFIG_MALI400)      += mali400/

diff --git a/drivers/gpu/arm/Kconfig b/drivers/gpu/arm/Kconfig
index 1f30eb541d65256b153abbf1e3b39094571d2650..10a71c6a3c23c2ddd56c54eafbd31d8630970cdc 100755 (executable)
--- a/drivers/gpu/arm/Kconfig
+++ b/drivers/gpu/arm/Kconfig
@@ -11,9 +11,18 @@
 # Boston, MA  02110-1301, USA.
 #
 #
+#
+source "drivers/gpu/arm/mali400/mali/Kconfig"
+
+choice
+       prompt "Mali Midgard driver"
+
+config MALI_MIDGARD_FOR_ANDROID
+       bool "Mali Midgard for Android"
 
+config MALI_MIDGARD_FOR_LINUX
+       bool "Mali Midgard for Linux only"
 
+endchoice
 
-menu "ARM GPU Configuration"
 source "drivers/gpu/arm/midgard/Kconfig"
-endmenu

diff --git a/drivers/gpu/arm/midgard_for_linux/Kconfig b/drivers/gpu/arm/midgard_for_linux/Kconfig
index 201832b262d465c3cccc24571c9feafba60d24e1..5cafc9e8e4326412bd97bb81fe267a58f72b5c98 100644 (file)
--- a/drivers/gpu/arm/midgard_for_linux/Kconfig
+++ b/drivers/gpu/arm/midgard_for_linux/Kconfig
@@ -15,8 +15,7 @@
 
 
 menuconfig MALI_MIDGARD
-       tristate "Mali Midgard series support"
-       select GPU_TRACEPOINTS if ANDROID
+       tristate "Mali Midgard series support (Linux only)"
        default n
        help
          Enable this option to build support for a ARM Mali Midgard GPU.

diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 1447654733bed21804b61db2574dbfaebedfbaaa..e0d11399139e1c6252ef1da4ded4e69ecb88f199 100644 (file)
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -26,16 +26,7 @@ source "drivers/gpu/drm/Kconfig"
 
 source "drivers/gpu/rogue_m/Kconfig"
 
-config MALI_MIDGARD_FOR_LINUX
-       bool "Mali Midgard for RK Linux device only"
-       default n
-
-# midgard src for devices other than RK Linux device.
-if !MALI_MIDGARD_FOR_LINUX
-       source "drivers/gpu/arm/midgard/Kconfig"
-endif
-
-source "drivers/gpu/arm/mali400/mali/Kconfig"
+source "drivers/gpu/arm/Kconfig"
 
 menu "Frame buffer Devices"
 source "drivers/video/fbdev/Kconfig"