From 766e61421d4500a3259cec82704cfcf3ad1b85ee Mon Sep 17 00:00:00 2001 From: Zhen Chen Date: Mon, 13 Sep 2021 11:33:15 +0800 Subject: [PATCH] MALI: remove MALI_MIDGARD_FOR_ANDROID and MALI_MIDGARD_FOR_LINUX Because they are no longer useful, after rk3288/rk3399 Android and Linux device use the same midgard_device_driver "drivers/gpu/arm/midgard". Change-Id: I7ccc3c99fdfdde5a0ea12a7f3e1931fd5f1ce4cb Signed-off-by: Zhen Chen --- drivers/gpu/arm/Kbuild | 5 +---- drivers/gpu/arm/Kconfig | 11 ----------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/drivers/gpu/arm/Kbuild b/drivers/gpu/arm/Kbuild index b3466f167d8e..2622f2941a64 100644 --- a/drivers/gpu/arm/Kbuild +++ b/drivers/gpu/arm/Kbuild @@ -19,10 +19,7 @@ # # - -# obj-$(CONFIG_MALI_MIDGARD_FOR_LINUX) += midgard_for_linux/ - -obj-$(CONFIG_MALI_MIDGARD_FOR_ANDROID) += midgard/ +obj-$(CONFIG_MALI_MIDGARD) += midgard/ obj-$(CONFIG_MALI400) += mali400/ diff --git a/drivers/gpu/arm/Kconfig b/drivers/gpu/arm/Kconfig index 599711c18af9..d6211e33276c 100644 --- a/drivers/gpu/arm/Kconfig +++ b/drivers/gpu/arm/Kconfig @@ -21,17 +21,6 @@ # 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 - source "drivers/gpu/arm/midgard/Kconfig" choice