Martin Roth (martinroth@google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/13608
-gerrit
commit ee3ef78ed02ebf536005d832046e8ee3aa6f2752 Author: Martin Roth martinroth@google.com Date: Thu Feb 4 19:52:27 2016 -0700
Kconfig: Move payloads section to payloads/Kconfig
Move the payloads section of the kconfig tree out of the top level kconfig file and into a separate Kconfig just for payloads before it starts to get added to.
Change-Id: I4f52818f862bf1aeba538c1c6ed93211a78b9853 Signed-off-by: Martin Roth martinroth@google.com --- payloads/Kconfig | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ src/Kconfig | 51 +-------------------------------------------------- 2 files changed, 52 insertions(+), 50 deletions(-)
diff --git a/payloads/Kconfig b/payloads/Kconfig new file mode 100644 index 0000000..51c89ea --- /dev/null +++ b/payloads/Kconfig @@ -0,0 +1,51 @@ +menu "Payload" + +choice + prompt "Add a payload" + default PAYLOAD_NONE if !ARCH_X86 + default PAYLOAD_SEABIOS if ARCH_X86 + +config PAYLOAD_NONE + bool "None" + help + Select this option if you want to create an "empty" coreboot + ROM image for a certain mainboard, i.e. a coreboot ROM image + which does not yet contain a payload. + + For such an image to be useful, you have to use 'cbfstool' + to add a payload to the ROM image later. + +config PAYLOAD_ELF + bool "An ELF executable payload" + help + Select this option if you have a payload image (an ELF file) + which coreboot should run as soon as the basic hardware + initialization is completed. + + You will be able to specify the location and file name of the + payload image later. + +source "payloads/external/*/Kconfig.name" + +endchoice + +source "payloads/external/*/Kconfig" + +config PAYLOAD_FILE + string "Payload path and filename" + depends on PAYLOAD_ELF + default "payload.elf" + help + The path and filename of the ELF executable file to use as payload. + +# TODO: Defined if no payload? Breaks build? +config COMPRESSED_PAYLOAD_LZMA + bool "Use LZMA compression for payloads" + default y + depends on !PAYLOAD_NONE && !PAYLOAD_LINUX + help + In order to reduce the size payloads take up in the ROM chip + coreboot can compress them using the LZMA algorithm. + +endmenu + diff --git a/src/Kconfig b/src/Kconfig index feefc91..35acad4 100644 --- a/src/Kconfig +++ b/src/Kconfig @@ -732,56 +732,7 @@ config MAINBOARD_SMBIOS_PRODUCT_NAME
endmenu
-menu "Payload" - -choice - prompt "Add a payload" - default PAYLOAD_NONE if !ARCH_X86 - default PAYLOAD_SEABIOS if ARCH_X86 - -config PAYLOAD_NONE - bool "None" - help - Select this option if you want to create an "empty" coreboot - ROM image for a certain mainboard, i.e. a coreboot ROM image - which does not yet contain a payload. - - For such an image to be useful, you have to use 'cbfstool' - to add a payload to the ROM image later. - -config PAYLOAD_ELF - bool "An ELF executable payload" - help - Select this option if you have a payload image (an ELF file) - which coreboot should run as soon as the basic hardware - initialization is completed. - - You will be able to specify the location and file name of the - payload image later. - -source "payloads/external/*/Kconfig.name" - -endchoice - -source "payloads/external/*/Kconfig" - -config PAYLOAD_FILE - string "Payload path and filename" - depends on PAYLOAD_ELF - default "payload.elf" - help - The path and filename of the ELF executable file to use as payload. - -# TODO: Defined if no payload? Breaks build? -config COMPRESSED_PAYLOAD_LZMA - bool "Use LZMA compression for payloads" - default y - depends on !PAYLOAD_NONE && !PAYLOAD_LINUX - help - In order to reduce the size payloads take up in the ROM chip - coreboot can compress them using the LZMA algorithm. - -endmenu +source "payloads/Kconfig"
menu "Debugging"