summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAhmad Fatoum <a.fatoum@pengutronix.de>2021-11-22 09:47:13 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2021-11-25 08:43:59 +0100
commitba42121dae2eeed8aaf7003910add61d9f0af299 (patch)
treef54250360c56ea5389c8876645fce020d628a48d
parentf57af3348d2a80b92bae9ab4b882a8e0e2c87002 (diff)
downloadbarebox-ba42121dae2eeed8aaf7003910add61d9f0af299.tar.gz
barebox-ba42121dae2eeed8aaf7003910add61d9f0af299.tar.xz
drivers: efi: move Kconfig options to new menu
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@pengutronix.de> Link: https://lore.barebox.org/20211122084732.2597109-12-a.fatoum@pengutronix.de Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r--arch/x86/Kconfig3
-rw-r--r--common/efi/Kconfig10
-rw-r--r--drivers/Kconfig1
-rw-r--r--drivers/efi/Kconfig7
4 files changed, 10 insertions, 11 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index bcb44b23f0..f40b14dddc 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 a0565854c2..55939b43d6 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 dbdf3c06f5..f8d58b0697 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 e8abc2709e..0000000000
--- 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