From a8c54703133ec9243b50ad5c90cecc5cc415b86a Mon Sep 17 00:00:00 2001
From: Zhen Chen <chenzhen@rock-chips.com>
Date: Mon, 13 Sep 2021 15:40:10 +0800
Subject: [PATCH] MALI: remove definitions of MALI_BIFROST_FOR_ANDROID and
 MALI_BIFROST_FOR_LINUX

Signed-off-by: Zhen Chen <chenzhen@rock-chips.com>
Change-Id: Idd03a830e62582fe738919b7ef4d43163e9cdcb1
---
 drivers/gpu/arm/Kbuild  |  4 +---
 drivers/gpu/arm/Kconfig | 11 -----------
 2 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/drivers/gpu/arm/Kbuild b/drivers/gpu/arm/Kbuild
index 2622f2941a64..62b4706f7326 100644
--- a/drivers/gpu/arm/Kbuild
+++ b/drivers/gpu/arm/Kbuild
@@ -23,6 +23,4 @@ obj-$(CONFIG_MALI_MIDGARD) += midgard/
 
 obj-$(CONFIG_MALI400)      += mali400/
 
-obj-$(CONFIG_MALI_BIFROST_FOR_ANDROID) += bifrost/
-
-obj-$(CONFIG_MALI_BIFROST_FOR_LINUX) += bifrost_for_linux/
+obj-$(CONFIG_MALI_BIFROST) += bifrost/
diff --git a/drivers/gpu/arm/Kconfig b/drivers/gpu/arm/Kconfig
index d6211e33276c..64ede484d1dc 100644
--- a/drivers/gpu/arm/Kconfig
+++ b/drivers/gpu/arm/Kconfig
@@ -23,15 +23,4 @@ source "drivers/gpu/arm/mali400/mali/Kconfig"
 
 source "drivers/gpu/arm/midgard/Kconfig"
 
-choice
-	prompt "Mali bifrost driver"
-
-config MALI_BIFROST_FOR_ANDROID
-	bool "Mali Bifrost for Android"
-
-config MALI_BIFROST_FOR_LINUX
-	bool "Mali Bifrost for Linux only"
-
-endchoice
-
 source "drivers/gpu/arm/bifrost/Kconfig"