Martin Roth (martinroth@google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/17907
-gerrit
commit e05fff917a787be20801a9969455dea7d532a5b0 Author: Martin Roth martinroth@google.com Date: Thu Dec 15 15:25:15 2016 -0700
src/Kconfig: Move options with no prompt towards the end of the file
Options with no prompt can go anywhere in the tree with the same dependencies and they have the same effect. Moving them lower in the tree allows the default values to be overridden by other Kconfig files.
Verified that this makes no significant changes to any config file.
Change-Id: I46175756b937a241edba87dbf70ce1be851fa89d Signed-off-by: Martin Roth martinroth@google.com --- src/Kconfig | 193 ++++++++++++++++++++++++++++++------------------------------ 1 file changed, 95 insertions(+), 98 deletions(-)
diff --git a/src/Kconfig b/src/Kconfig index f6c3ff7..c0776d8 100644 --- a/src/Kconfig +++ b/src/Kconfig @@ -126,10 +126,6 @@ config STATIC_OPTION_TABLE every boot. Use this if you want the NVRAM configuration to never be modified from its default values.
-config UNCOMPRESSED_RAMSTAGE - bool - default n - config COMPRESS_RAMSTAGE bool "Compress ramstage with LZMA" # Default value set at the end of the file @@ -181,22 +177,6 @@ config INCLUDE_CONFIG_FILE config 0x8d740 raw 3324 (empty) 0x8e480 null 3610440
-config NO_XIP_EARLY_STAGES - bool - default n if ARCH_X86 - default y - help - Identify if early stages are eXecute-In-Place(XIP). - -config EARLY_CBMEM_INIT - def_bool !LATE_CBMEM_INIT - -config EARLY_CBMEM_LIST - bool - default n - help - Enable display of CBMEM during romstage and postcar. - config COLLECT_TIMESTAMPS bool "Create a table of timestamps collected during boot" default n @@ -221,14 +201,6 @@ config COVERAGE coverage information in CBMEM for extraction from user space. If unsure, say N.
-config RELOCATABLE_MODULES - bool - default n - help - If RELOCATABLE_MODULES is selected then support is enabled for - building relocatable modules in the RAM stage. Those modules can be - loaded anywhere and all the relocations are handled automatically. - config RELOCATABLE_RAMSTAGE depends on EARLY_CBMEM_INIT bool "Build the ramstage to be relocatable in 32-bit address space." @@ -249,13 +221,6 @@ config CACHE_RELOCATED_RAMSTAGE_OUTSIDE_CBMEM The relocated ramstage is saved in an area specified by the by the board and/or chipset.
-config NO_STAGE_CACHE - bool - default n - help - Do not save any component in stage cache for resume path. On resume, - all components would be read back from CBFS again. - # TODO: This doesn't belong here, move to src/arch/x86/Kconfig choice prompt "Bootblock behaviour" @@ -269,23 +234,11 @@ config BOOTBLOCK_NORMAL
endchoice
-# To be selected by arch, SoC or mainboard if it does not want use the normal -# src/lib/bootblock.c#main() C entry point. -config BOOTBLOCK_CUSTOM - bool - default n - config BOOTBLOCK_SOURCE string default "bootblock_simple.c" if BOOTBLOCK_SIMPLE default "bootblock_normal.c" if BOOTBLOCK_NORMAL
-# To be selected by arch or platform if a C environment is available during the -# bootblock. Normally this signifies availability of RW memory (e.g. SRAM). -config C_ENVIRONMENT_BOOTBLOCK - bool - default n - config SKIP_MAX_REBOOT_CNT_CLEAR bool "Do not clear reboot count after successful boot" default n @@ -307,56 +260,6 @@ config UPDATE_IMAGE
If unsure, select 'N'
-config GENERIC_GPIO_LIB - bool - default n - help - If enabled, compile the generic GPIO library. A "generic" GPIO - implies configurability usually found on SoCs, particularly the - ability to control internal pull resistors. - -config GENERIC_SPD_BIN - bool - default n - help - If enabled, add support for adding spd.hex files in cbfs as spd.bin - and locating it runtime to load SPD. Additionally provide provision to - fetch SPD over SMBus. - -config DIMM_MAX - int - default 4 - depends on GENERIC_SPD_BIN - help - Total number of memory DIMM slots available on motherboard. - It is multiplication of number of channel to number of DIMMs per - channel - -config DIMM_SPD_SIZE - int - default 256 - depends on GENERIC_SPD_BIN - help - Total SPD size that will be used for DIMM. - Ex: DDR3 256, DDR4 512. - -config BOARD_ID_AUTO - bool - default n - help - Mainboards that can read a board ID from the hardware straps - (ie. GPIO) select this configuration option. - -config BOARD_ID_MANUAL - bool - default n - depends on !BOARD_ID_AUTO - help - If you want to maintain a board ID, but the hardware does not - have straps to automatically determine the ID, you can say Y - here and add a file named 'board_id' to CBFS. If you don't know - what this is about, say N. - config BOARD_ID_STRING string "Board ID" # Default value set at the end of the file @@ -1166,7 +1069,10 @@ config DEBUG_ADA_CODE
endmenu
-# These probably belong somewhere else, but they are needed somewhere. + +############################################################################### +# Set variables with no prompt - these can be set anywhere, and putting at +# the end of this file gives the most flexibility. config ENABLE_APIC_EXT_ID bool default n @@ -1272,6 +1178,97 @@ config RAMSTAGE_LIBHWBASE config HWBASE_DYNAMIC_MMIO def_bool y
+config UNCOMPRESSED_RAMSTAGE + bool + +config NO_XIP_EARLY_STAGES + bool + default n if ARCH_X86 + default y + help + Identify if early stages are eXecute-In-Place(XIP). + +config EARLY_CBMEM_INIT + def_bool !LATE_CBMEM_INIT + +config EARLY_CBMEM_LIST + bool + default n + help + Enable display of CBMEM during romstage and postcar. + +config RELOCATABLE_MODULES + bool + help + If RELOCATABLE_MODULES is selected then support is enabled for + building relocatable modules in the RAM stage. Those modules can be + loaded anywhere and all the relocations are handled automatically. + +config NO_STAGE_CACHE + bool + help + Do not save any component in stage cache for resume path. On resume, + all components would be read back from CBFS again. + +config GENERIC_GPIO_LIB + bool + help + If enabled, compile the generic GPIO library. A "generic" GPIO + implies configurability usually found on SoCs, particularly the + ability to control internal pull resistors. + +config GENERIC_SPD_BIN + bool + help + If enabled, add support for adding spd.hex files in cbfs as spd.bin + and locating it runtime to load SPD. Additionally provide provision to + fetch SPD over SMBus. + +config DIMM_MAX + int + default 4 + depends on GENERIC_SPD_BIN + help + Total number of memory DIMM slots available on motherboard. + It is multiplication of number of channel to number of DIMMs per + channel + +config DIMM_SPD_SIZE + int + default 256 + depends on GENERIC_SPD_BIN + help + Total SPD size that will be used for DIMM. + Ex: DDR3 256, DDR4 512. + +config BOARD_ID_AUTO + bool + default n + help + Mainboards that can read a board ID from the hardware straps + (ie. GPIO) select this configuration option. + +config BOARD_ID_MANUAL + bool + default n + depends on !BOARD_ID_AUTO + help + If you want to maintain a board ID, but the hardware does not + have straps to automatically determine the ID, you can say Y + here and add a file named 'board_id' to CBFS. If you don't know + what this is about, say N. + +config BOOTBLOCK_CUSTOM + # To be selected by arch, SoC or mainboard if it does not want use the normal + # src/lib/bootblock.c#main() C entry point. + bool + +config C_ENVIRONMENT_BOOTBLOCK + # To be selected by arch or platform if a C environment is available during the + # bootblock. Normally this signifies availability of RW memory (e.g. SRAM). + bool + + ############################################################################### # Set default values for symbols created before mainboards. This allows the # option to be displayed in the general menu, but the default to be loaded in