payloads: Move secondary payloads inside of a submenu
To keep the list of 'secondary' payloads from cluttering the payloads
menu, move them into their own menu under the payloads menu. Then they
don't need any dependencies other than the architecture.
Change-Id: I95119750c6ef627ef0de9b5f5cbad085a51ac2bb
Signed-off-by: Martin Roth <martinroth@google.com>
Reviewed-on: https://review.coreboot.org/13941
Tested-by: build bot (Jenkins)
Reviewed-by: Ben Gardner <gardner.ben@gmail.com>
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
diff --git a/payloads/Kconfig b/payloads/Kconfig
index 6ae2ecd..c7b9e2a 100644
--- a/payloads/Kconfig
+++ b/payloads/Kconfig
@@ -59,6 +59,8 @@
Add the payload to cbfs as a flat binary type instead of as an
elf payload
+menu "Secondary Payloads"
+
config COREINFO_SECONDARY_PAYLOAD
bool "Load coreinfo as a secondary payload"
default n
@@ -70,9 +72,10 @@
config MEMTEST_SECONDARY_PAYLOAD
bool "Load Memtest86+ as a secondary payload"
default n
- depends on ARCH_X86 && !PAYLOAD_NONE
+ depends on ARCH_X86
help
Memtest86+ can be loaded as a secondary payload under SeaBIOS, GRUB,
or any other payload that can load additional payloads.
+endmenu # "Secondary Payloads"
endmenu