From 168b11bc416eb0931581cc674a60bc53861081c3 Mon Sep 17 00:00:00 2001 From: Uwe Hermann Date: Wed, 7 Oct 2009 16:15:40 +0000 Subject: Various Kconfig fixes and improvements: - Add helps texts to multiple user-visible Kconfig options. - Improve some menu and option names. - PAYLOAD_NONE should come before PAYLOAD_ELF, so that you scroll down (instead of up) when changing "no payload" to "ELF payload" (more intuitive, IMHO). - s/cbfs/cbfstool/. - Add some TODO items where needed. - Put GDB_STUB in a "Debugging" menu, no options should be top-level. There'll be more debug options later, I'm pretty sure. - Start converting help texts which are not user-visible to #-comments. - Re-order some options for more intuitive menus. - Set ARCH_X86 and ARCH_POWERPC to "default n", each boards selects them. - "Maximum reboot count" should proabably not be user-selectable, or at most if CONFIG_EXPERT (yet to be added) is enabled. It does definately not need its own "Misc options" menu. - Set PCI_ROM_RUN and VGA_ROM_RUN to "default y", most users will want to run option ROMs. Signed-off-by: Uwe Hermann Acked-by: Uwe Hermann git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4734 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/Kconfig | 64 +++++++++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 43 insertions(+), 21 deletions(-) (limited to 'src/Kconfig') diff --git a/src/Kconfig b/src/Kconfig index 273d770a5f..6458037497 100644 --- a/src/Kconfig +++ b/src/Kconfig @@ -30,10 +30,15 @@ mainmenu "Coreboot Configuration" menu "General setup" config LOCALVERSION - string "Local version - append to coreboot release" + string "Local version string" help Append an extra string to the end of the coreboot version. + This can be useful if, for instance, you want to append the + respective board's hostname or some other identifying string to + the coreboot version number, so that you can easily distinguish + boot logs of different boards from each other. + endmenu source src/mainboard/Kconfig @@ -225,10 +230,10 @@ config GFXUMA # TODO # menu "Drivers" -# +# # endmenu -menu "Generated System Tables" +menu "System tables" config HAVE_LOW_TABLES bool @@ -239,7 +244,7 @@ config HAVE_HIGH_TABLES default y config MULTIBOOT - bool "Add Multiboot tables (for grub2)" + bool "Generate Multiboot tables (for GRUB2)" default n config HAVE_ACPI_TABLES @@ -258,16 +263,22 @@ endmenu menu "Payload" -config COMPRESSED_PAYLOAD_LZMA - bool "Use LZMA compression for payloads" - default yes - choice - prompt "Payload type" + prompt "Add a payload" default PAYLOAD_NONE +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 file" + 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 @@ -275,15 +286,6 @@ config PAYLOAD_ELF You will be able to specify the location and file name of the payload image later. -config PAYLOAD_NONE - bool "No payload" - 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 the 'cbfs' tool - to add a payload to the ROM image later. endchoice @@ -294,6 +296,15 @@ config FALLBACK_PAYLOAD_FILE 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_ELF + help + In order to reduce the size payloads take up in the ROM chip + coreboot can compress them using the LZMA algorithm. + endmenu menu "VGA BIOS" @@ -319,11 +330,20 @@ config FALLBACK_VGA_BIOS_ID depends on VGA_BIOS default "1106,3230" help - The ID that would associate your VGA BIOS to your video card. - (PCI VendorID, PCI Device ID) + The comma-separated PCI vendor and device ID that would associate + your VGA BIOS to your video card. + + Example: 1106,3230 + + In the above example 1106 is the PCI vendor ID (in hex, but without + the "0x" prefix) and 3230 specifies the PCI device ID of the + video card (also in hex, without "0x" prefix). endmenu +menu "Debugging" + +# TODO: Better help text and detailed instructions. config GDB_STUB bool "GDB debugging support" default y @@ -331,3 +351,5 @@ config GDB_STUB If enabled, you will be able to set breakpoints for gdb debugging. See src/arch/i386/lib/c_start.S for details. +endmenu + -- cgit v1.2.3