From: Ahmad Fatoum <[email protected]>

We are already keeping different directories for payload and common EFI
support. In preparation for adding more payload-specific config options,
move the existing ones into their own Kconfig file.

Signed-off-by: Ahmad Fatoum <[email protected]>
Signed-off-by: Chali Anis <[email protected]>
---
 efi/Kconfig         | 20 +-------------------
 efi/payload/Kconfig | 27 +++++++++++++++++++++++++++
 2 files changed, 28 insertions(+), 19 deletions(-)
 create mode 100644 efi/payload/Kconfig

diff --git a/efi/Kconfig b/efi/Kconfig
index 84f670fd23d3..35850b20ef50 100644
--- a/efi/Kconfig
+++ b/efi/Kconfig
@@ -2,21 +2,7 @@
 
 menu "EFI (Extensible Firmware Interface) Support"
 
-config HAVE_EFI_PAYLOAD
-       bool
-
-config EFI_PAYLOAD
-       bool "Build as EFI payload" if COMPILE_TEST
-       depends on HAVE_EFI_PAYLOAD
-       select PBL_FULLY_PIC if ARM64
-       select EFI
-       select EFI_GUID
-       select EFI_DEVICEPATH
-       select PRINTF_UUID
-       select PRINTF_WCHAR
-       select BLOCK
-       select PARTITION_DISK
-       select HW_HAS_PCI
+source "efi/payload/Kconfig"
 
 config EFI
        bool
@@ -26,10 +12,6 @@ config HAVE_EFI_STUB
 
 if EFI
 
-config EFI_STUB
-       def_bool EFI_PAYLOAD
-       depends on HAVE_EFI_STUB
-
 config EFI_GUID
        bool
        help
diff --git a/efi/payload/Kconfig b/efi/payload/Kconfig
new file mode 100644
index 000000000000..9263d59de94a
--- /dev/null
+++ b/efi/payload/Kconfig
@@ -0,0 +1,27 @@
+# SPDX-License-Identifier: GPL-2.0-only
+
+config HAVE_EFI_PAYLOAD
+       bool
+
+config EFI_PAYLOAD
+       bool "Build as EFI payload" if COMPILE_TEST
+       depends on HAVE_EFI_PAYLOAD
+       select PBL_FULLY_PIC if ARM64
+       select EFI
+       select EFI_GUID
+       select EFI_DEVICEPATH
+       select PRINTF_UUID
+       select PRINTF_WCHAR
+       select BLOCK
+       select PARTITION_DISK
+       select HW_HAS_PCI
+
+config HAVE_EFI_STUB
+       bool
+
+if EFI_PAYLOAD
+
+config EFI_STUB
+       def_bool HAVE_EFI_STUB
+
+endif
-- 
2.34.1


Reply via email to