[PATCH 11/30] drivers: efi: move Kconfig options to new menu

[Ahmad Fatoum]

CONFIG_EFI_BOOTUP isn't really a driver option and we got a new menu now
for all things EFI, so let's move it there.

Signed-off-by: Ahmad Fatoum <a.fatoum at pengutronix.de>
---
 arch/x86/Kconfig    |  3 ---
 common/efi/Kconfig  | 10 ++++++++++
 drivers/Kconfig     |  1 -
 drivers/efi/Kconfig |  7 -------
 4 files changed, 10 insertions(+), 11 deletions(-)
 delete mode 100644 drivers/efi/Kconfig

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index bcb44b23f05a..f40b14dddc00 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -47,7 +47,4 @@ config MACH_EFI_GENERIC
 config X86_EFI
 	def_bool y
 	select EFI_BOOTUP
-	select EFI_GUID
-	select EFI_DEVICEPATH
-	select PRINTF_UUID
 	select CLOCKSOURCE_EFI_X86
diff --git a/common/efi/Kconfig b/common/efi/Kconfig
index a0565854c2f5..55939b43d684 100644
--- a/common/efi/Kconfig
+++ b/common/efi/Kconfig
@@ -2,6 +2,16 @@
 
 menu "EFI (Extensible Firmware Interface) Support"
 
+config EFI_BOOTUP
+	bool
+	select EFI
+	select EFI_GUID
+	select EFI_DEVICEPATH
+	select PRINTF_UUID
+	select BLOCK
+	select PARTITION_DISK
+	select HW_HAS_PCI
+
 config EFI
 	bool
 
diff --git a/drivers/Kconfig b/drivers/Kconfig
index dbdf3c06f552..f8d58b0697ba 100644
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@ -2,7 +2,6 @@
 menu "Drivers"
 
 source "drivers/base/Kconfig"
-source "drivers/efi/Kconfig"
 source "drivers/of/Kconfig"
 source "drivers/aiodev/Kconfig"
 source "drivers/amba/Kconfig"
diff --git a/drivers/efi/Kconfig b/drivers/efi/Kconfig
deleted file mode 100644
index e8abc2709e26..000000000000
--- a/drivers/efi/Kconfig
+++ /dev/null
@@ -1,7 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0
-config EFI_BOOTUP
-	bool
-	select EFI
-	select BLOCK
-	select PARTITION_DISK
-	select HW_HAS_PCI
-- 
2.30.2