summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNico Huber <nico.h@gmx.de>2017-05-20 17:57:01 +0200
committerStefan Reinauer <stefan.reinauer@coreboot.org>2017-06-06 17:16:31 +0200
commita2cf686396e3a6a0b5ff544aaa70c652cd75da4e (patch)
treec2e76864b0e08f383ae593d18fdf865e03079d8a
parentb09933a2eb9b0fbbfe35392dac98d415290867aa (diff)
downloadcoreboot-a2cf686396e3a6a0b5ff544aaa70c652cd75da4e.tar.xz
device/Kconfig: Move "Display" menu below gfx options
Make the "Display" menu a submenu of "Devices", place it below the graphics options and reorder options by their dependencies. Change-Id: I9de3d8f76ae10b0a77678ce2d71f840fac32379c Signed-off-by: Nico Huber <nico.h@gmx.de> Reviewed-on: https://review.coreboot.org/19806 Reviewed-by: Patrick Rudolph <siro@das-labor.org> Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Martin Roth <martinroth@google.com>
-rw-r--r--src/device/Kconfig379
1 files changed, 190 insertions, 189 deletions
diff --git a/src/device/Kconfig b/src/device/Kconfig
index c727fba854..5d9aa899bb 100644
--- a/src/device/Kconfig
+++ b/src/device/Kconfig
@@ -217,185 +217,6 @@ config MULTIPLE_VGA_ADAPTERS
bool
default n
-config SMBUS_HAS_AUX_CHANNELS
- bool
- default n
-
-config PCI
- bool
- default n
-
-if PCI
-
-config NO_MMCONF_SUPPORT
- bool
- default n
-
-config MMCONF_SUPPORT
- bool
- default !NO_MMCONF_SUPPORT
-
-config HYPERTRANSPORT_PLUGIN_SUPPORT
- bool
- default n
-
-config PCIX_PLUGIN_SUPPORT
- bool
- default y
-
-config CARDBUS_PLUGIN_SUPPORT
- bool
- default y
-
-config AZALIA_PLUGIN_SUPPORT
- bool
- default n
-
-config PCIEXP_PLUGIN_SUPPORT
- bool
- default y
-
-endif # PCI
-
-if PCIEXP_PLUGIN_SUPPORT
-
-config PCIEXP_COMMON_CLOCK
- prompt "Enable PCIe Common Clock"
- bool
- default n
- help
- Detect and enable Common Clock on PCIe links.
-
-config PCIEXP_ASPM
- prompt "Enable PCIe ASPM"
- bool
- default n
- help
- Detect and enable ASPM (Active State Power Management) on PCIe links.
-
-config PCIEXP_CLK_PM
- prompt "Enable PCIe Clock Power Management"
- bool
- default n
- help
- Detect and enable Clock Power Management on PCIe.
-
-config PCIEXP_L1_SUB_STATE
- prompt "Enable PCIe ASPM L1 SubState"
- bool
- depends on (MMCONF_SUPPORT || PCI_IO_CFG_EXT)
- default n
- help
- Detect and enable ASPM on PCIe links.
-
-endif # PCIEXP_PLUGIN_SUPPORT
-
-config EARLY_PCI_BRIDGE
- bool "Early PCI bridge"
- depends on PCI
- default n
- help
- While coreboot is executing code from ROM, the coreboot resource
- allocator has not been running yet. Hence PCI devices living behind
- a bridge are not yet visible to the system.
-
- This option enables static configuration for a single pre-defined
- PCI bridge function on bus 0.
-
-if EARLY_PCI_BRIDGE
-
-config EARLY_PCI_BRIDGE_DEVICE
- hex "bridge device"
- default 0x0
-
-config EARLY_PCI_BRIDGE_FUNCTION
- hex "bridge function"
- default 0x0
-
-config EARLY_PCI_MMIO_BASE
- hex "MMIO window base"
- default 0x0
-
-endif # EARLY_PCI_BRIDGE
-
-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.
-
-config VGA_BIOS
- bool "Add a VGA BIOS image"
- depends on ARCH_X86
- help
- Select this option if you have a VGA BIOS image that you would
- like to add to your ROM.
-
- You will be able to specify the location and file name of the
- image later.
-
-config VGA_BIOS_FILE
- string "VGA BIOS path and filename"
- depends on VGA_BIOS
- default "vgabios.bin"
- help
- The path and filename of the file to use as VGA BIOS.
-
-config VGA_BIOS_ID
- string "VGA device PCI IDs"
- depends on VGA_BIOS
- default "1106,3230"
- help
- 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).
-
- Under GNU/Linux you can run `lspci -nn` to list the IDs of your PCI devices.
-
-config INTEL_MBI
- bool "Add an MBI image"
- depends on NORTHBRIDGE_INTEL_I82830
- help
- Select this option if you have an Intel MBI image that you would
- like to add to your ROM.
-
- You will be able to specify the location and file name of the
- image later.
-
-config MBI_FILE
- string "Intel MBI path and filename"
- depends on INTEL_MBI
- default "mbi.bin"
- help
- The path and filename of the file to use as VGA BIOS.
-
-config SOFTWARE_I2C
- bool "Enable I2C controller emulation in software"
- default n
- help
- This config option will enable code to override the i2c_transfer
- routine with a (simple) software emulation of the protocol. This may
- be useful for debugging or on platforms where a driver for the real
- I2C controller is not (yet) available. The platform code needs to
- provide bindings to manually toggle I2C lines.
-
-endmenu
-
menu "Display"
depends on HAVE_VGA_TEXT_FRAMEBUFFER || HAVE_LINEAR_FRAMEBUFFER
@@ -407,10 +228,11 @@ config FRAMEBUFFER_SET_VESA_MODE
help
Set VESA/native framebuffer mode (needed for bootsplash and graphical framebuffer console)
+if FRAMEBUFFER_SET_VESA_MODE
+
choice
prompt "framebuffer graphics resolution"
default FRAMEBUFFER_VESA_MODE_117
- depends on FRAMEBUFFER_SET_VESA_MODE
help
This option sets the resolution used for the coreboot framebuffer (and
bootsplash screen).
@@ -501,7 +323,6 @@ config FRAMEBUFFER_VESA_MODE_11B
config FRAMEBUFFER_VESA_MODE_USER
bool "Manually select VESA mode"
- depends on !MAINBOARD_DO_NATIVE_VGA_INIT
endchoice
@@ -539,6 +360,19 @@ config FRAMEBUFFER_VESA_MODE
default 0x11B if FRAMEBUFFER_VESA_MODE_11B
default 0x117 if FRAMEBUFFER_VESA_MODE_USER
+config BOOTSPLASH
+ prompt "Show graphical bootsplash"
+ bool
+ help
+ This option shows a graphical bootsplash screen. The graphics are
+ loaded from the CBFS file bootsplash.jpg.
+
+ You can either specify the location and file name of the
+ image in the 'General' section or add it manually to CBFS, using,
+ for example, cbfstool.
+
+endif # FRAMEBUFFER_SET_VESA_MODE
+
choice
prompt "Framebuffer mode"
default VGA_TEXT_FRAMEBUFFER
@@ -578,16 +412,183 @@ config LINEAR_FRAMEBUFFER
def_bool y
depends on VBE_LINEAR_FRAMEBUFFER || GENERIC_LINEAR_FRAMEBUFFER
-config BOOTSPLASH
- prompt "Show graphical bootsplash"
+endmenu # "Display"
+
+config SMBUS_HAS_AUX_CHANNELS
+ bool
+ default n
+
+config PCI
+ bool
+ default n
+
+if PCI
+
+config NO_MMCONF_SUPPORT
+ bool
+ default n
+
+config MMCONF_SUPPORT
bool
- depends on FRAMEBUFFER_SET_VESA_MODE
+ default !NO_MMCONF_SUPPORT
+
+config HYPERTRANSPORT_PLUGIN_SUPPORT
+ bool
+ default n
+
+config PCIX_PLUGIN_SUPPORT
+ bool
+ default y
+
+config CARDBUS_PLUGIN_SUPPORT
+ bool
+ default y
+
+config AZALIA_PLUGIN_SUPPORT
+ bool
+ default n
+
+config PCIEXP_PLUGIN_SUPPORT
+ bool
+ default y
+
+endif # PCI
+
+if PCIEXP_PLUGIN_SUPPORT
+
+config PCIEXP_COMMON_CLOCK
+ prompt "Enable PCIe Common Clock"
+ bool
+ default n
help
- This option shows a graphical bootsplash screen. The graphics are
- loaded from the CBFS file bootsplash.jpg.
+ Detect and enable Common Clock on PCIe links.
- You can either specify the location and file name of the
- image in the 'General' section or add it manually to CBFS, using,
- for example, cbfstool.
+config PCIEXP_ASPM
+ prompt "Enable PCIe ASPM"
+ bool
+ default n
+ help
+ Detect and enable ASPM (Active State Power Management) on PCIe links.
+
+config PCIEXP_CLK_PM
+ prompt "Enable PCIe Clock Power Management"
+ bool
+ default n
+ help
+ Detect and enable Clock Power Management on PCIe.
+
+config PCIEXP_L1_SUB_STATE
+ prompt "Enable PCIe ASPM L1 SubState"
+ bool
+ depends on (MMCONF_SUPPORT || PCI_IO_CFG_EXT)
+ default n
+ help
+ Detect and enable ASPM on PCIe links.
+
+endif # PCIEXP_PLUGIN_SUPPORT
+
+config EARLY_PCI_BRIDGE
+ bool "Early PCI bridge"
+ depends on PCI
+ default n
+ help
+ While coreboot is executing code from ROM, the coreboot resource
+ allocator has not been running yet. Hence PCI devices living behind
+ a bridge are not yet visible to the system.
+
+ This option enables static configuration for a single pre-defined
+ PCI bridge function on bus 0.
+
+if EARLY_PCI_BRIDGE
+
+config EARLY_PCI_BRIDGE_DEVICE
+ hex "bridge device"
+ default 0x0
+
+config EARLY_PCI_BRIDGE_FUNCTION
+ hex "bridge function"
+ default 0x0
+
+config EARLY_PCI_MMIO_BASE
+ hex "MMIO window base"
+ default 0x0
+
+endif # EARLY_PCI_BRIDGE
+
+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.
+
+config VGA_BIOS
+ bool "Add a VGA BIOS image"
+ depends on ARCH_X86
+ help
+ Select this option if you have a VGA BIOS image that you would
+ like to add to your ROM.
+
+ You will be able to specify the location and file name of the
+ image later.
+
+config VGA_BIOS_FILE
+ string "VGA BIOS path and filename"
+ depends on VGA_BIOS
+ default "vgabios.bin"
+ help
+ The path and filename of the file to use as VGA BIOS.
+
+config VGA_BIOS_ID
+ string "VGA device PCI IDs"
+ depends on VGA_BIOS
+ default "1106,3230"
+ help
+ 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).
+
+ Under GNU/Linux you can run `lspci -nn` to list the IDs of your PCI devices.
+
+config INTEL_MBI
+ bool "Add an MBI image"
+ depends on NORTHBRIDGE_INTEL_I82830
+ help
+ Select this option if you have an Intel MBI image that you would
+ like to add to your ROM.
+
+ You will be able to specify the location and file name of the
+ image later.
+
+config MBI_FILE
+ string "Intel MBI path and filename"
+ depends on INTEL_MBI
+ default "mbi.bin"
+ help
+ The path and filename of the file to use as VGA BIOS.
+
+config SOFTWARE_I2C
+ bool "Enable I2C controller emulation in software"
+ default n
+ help
+ This config option will enable code to override the i2c_transfer
+ routine with a (simple) software emulation of the protocol. This may
+ be useful for debugging or on platforms where a driver for the real
+ I2C controller is not (yet) available. The platform code needs to
+ provide bindings to manually toggle I2C lines.
endmenu