Kconfig: clean up options in top level and device menu

Move generic options to the "General Setup" menu.
Move device specific options to the "Devices" menu.

Change-Id: I514a021305d43f026b24fd3016477300700ed401
Signed-off-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Reviewed-on: http://review.coreboot.org/7089
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
This commit is contained in:
Stefan Reinauer 2014-10-17 13:08:36 +02:00
parent 06c788db1a
commit 58470e39b3
2 changed files with 96 additions and 103 deletions

View File

@ -199,6 +199,59 @@ config COVERAGE
coverage information in CBMEM for extraction from user space.
If unsure, say N.
config RELOCATABLE_MODULES
bool "Relocatable Modules"
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 (RELOCATABLE_MODULES && DYNAMIC_CBMEM)
bool "Build the ramstage to be relocatable in 32-bit address space."
default n
help
The reloctable ramstage support allows for the ramstage to be built
as a relocatable module. The stage loader can identify a place
out of the OS way so that copying memory is unnecessary during an S3
wake. When selecting this option the romstage is responsible for
determing a stack location to use for loading the ramstage.
config CACHE_RELOCATED_RAMSTAGE_OUTSIDE_CBMEM
depends on RELOCATABLE_RAMSTAGE
bool "Cache the relocated ramstage outside of cbmem."
default n
help
The relocated ramstage is saved in an area specified by the
by the board and/or chipset.
choice
prompt "Bootblock behaviour"
default BOOTBLOCK_SIMPLE
config BOOTBLOCK_SIMPLE
bool "Always load fallback"
config BOOTBLOCK_NORMAL
bool "Switch to normal if CMOS says so"
endchoice
config BOOTBLOCK_SOURCE
string
default "bootblock_simple.c" if BOOTBLOCK_SIMPLE
default "bootblock_normal.c" if BOOTBLOCK_NORMAL
config UPDATE_IMAGE
bool "Update existing coreboot.rom image"
default n
help
If this option is enabled, no new coreboot.rom file
is created. Instead it is expected that there already
is a suitable file for further processing.
The bootblock will not be modified.
endmenu
source src/mainboard/Kconfig
@ -224,36 +277,10 @@ source src/arch/arm64/Kconfig
source src/vendorcode/Kconfig
choice
prompt "Bootblock behaviour"
default BOOTBLOCK_SIMPLE
config BOOTBLOCK_SIMPLE
bool "Always load fallback"
config BOOTBLOCK_NORMAL
bool "Switch to normal if CMOS says so"
endchoice
config SYSTEM_TYPE_LAPTOP
default n
bool
config BOOTBLOCK_SOURCE
string
default "bootblock_simple.c" if BOOTBLOCK_SIMPLE
default "bootblock_normal.c" if BOOTBLOCK_NORMAL
config UPDATE_IMAGE
bool "Update existing coreboot.rom image"
default n
help
If this option is enabled, no new coreboot.rom file
is created. Instead it is expected that there already
is a suitable file for further processing.
The bootblock will not be modified.
menu "Chipset"
comment "CPU"
@ -410,33 +437,6 @@ config GFXUMA
help
Enable Unified Memory Architecture for graphics.
config RELOCATABLE_MODULES
bool "Relocatable Modules"
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 (RELOCATABLE_MODULES && DYNAMIC_CBMEM)
bool "Build the ramstage to be relocatable in 32-bit address space."
default n
help
The reloctable ramstage support allows for the ramstage to be built
as a relocatable module. The stage loader can identify a place
out of the OS way so that copying memory is unnecessary during an S3
wake. When selecting this option the romstage is responsible for
determing a stack location to use for loading the ramstage.
config CACHE_RELOCATED_RAMSTAGE_OUTSIDE_CBMEM
depends on RELOCATABLE_RAMSTAGE
bool "Cache the relocated ramstage outside of cbmem."
default n
help
The relocated ramstage is saved in an area specified by the
by the board and/or chipset.
config HAVE_ACPI_TABLES
bool
help

View File

@ -282,9 +282,21 @@ config EARLY_PCI_MMIO_BASE
endif # EARLY_PCI_BRIDGE
endmenu
config SUBSYSTEM_VENDOR_ID
hex "Override PCI Subsystem Vendor ID"
depends on PCI
default "0x0000"
help
This config option will override the devicetree settings for
PCI Subsystem Vendor ID.
menu "VGA BIOS"
config SUBSYSTEM_DEVICE_ID
hex "Override PCI Subsystem Device ID"
depends on PCI
default "0x0000"
help
This config option will override the devicetree settings for
PCI Subsystem Device ID.
config VGA_BIOS
bool "Add a VGA BIOS image"
@ -335,6 +347,35 @@ config MBI_FILE
help
The path and filename of the file to use as VGA BIOS.
config PXE_ROM
bool "Add a PXE ROM image"
help
Select this option if you have a PXE ROM image that you would
like to add to your ROM.
config PXE_ROM_FILE
string "PXE ROM filename"
depends on PXE_ROM
default "pxe.rom"
help
The path and filename of the file to use as PXE ROM.
config PXE_ROM_ID
string "network card PCI IDs"
depends on PXE_ROM
default "10ec,8168"
help
The comma-separated PCI vendor and device ID that would associate
your PXE ROM to your network card.
Example: 10ec,8168
In the above example 10ec is the PCI vendor ID (in hex, but without
the "0x" prefix) and 8168 specifies the PCI device ID of the
network card (also in hex, without "0x" prefix).
Under GNU/Linux you can run `lspci -nn` to list the IDs of your PCI devices.
endmenu
menu "Display"
@ -510,51 +551,3 @@ config BOOTSPLASH_FILE
screen. The file format has to be jpg.
endmenu
menu "PXE ROM"
config PXE_ROM
bool "Add a PXE ROM image"
help
Select this option if you have a PXE ROM image that you would
like to add to your ROM.
config PXE_ROM_FILE
string "PXE ROM filename"
depends on PXE_ROM
default "pxe.rom"
help
The path and filename of the file to use as PXE ROM.
config PXE_ROM_ID
string "network card PCI IDs"
depends on PXE_ROM
default "10ec,8168"
help
The comma-separated PCI vendor and device ID that would associate
your PXE ROM to your network card.
Example: 10ec,8168
In the above example 10ec is the PCI vendor ID (in hex, but without
the "0x" prefix) and 8168 specifies the PCI device ID of the
network card (also in hex, without "0x" prefix).
Under GNU/Linux you can run `lspci -nn` to list the IDs of your PCI devices.
endmenu
config SUBSYSTEM_VENDOR_ID
hex "Override PCI Subsystem Vendor ID"
depends on PCI
default "0x0000"
help
This config option will override the devicetree settings for
PCI Subsystem Vendor ID.
config SUBSYSTEM_DEVICE_ID
hex "Override PCI Subsystem Device ID"
depends on PCI
default "0x0000"
help
This config option will override the devicetree settings for
PCI Subsystem Device ID.