X60: use pnp_write_config() instead of custom function

[coreboot.git] / src / devices / Kconfig

diff --git a/src/devices/Kconfig b/src/devices/Kconfig
index 5e13e4e39303eb3d1a928122c2498d83469932c5..9e5ea6e09445a698564ecfaa530f2010785ab314 100644 (file)
--- a/src/devices/Kconfig
+++ b/src/devices/Kconfig
@@ -46,7 +46,7 @@ choice
        prompt "Option ROM execution type"
        default PCI_OPTION_ROM_RUN_YABEL if !ARCH_X86
        default PCI_OPTION_ROM_RUN_REALMODE if ARCH_X86
-       depends on PCI_ROM_RUN || VGA_ROM_RUN
+       depends on PCI_ROM_RUN || VGA_ROM_RUN || GEODE_VSA
 
 config PCI_OPTION_ROM_RUN_REALMODE
        prompt "Native mode"
@@ -61,6 +61,7 @@ config PCI_OPTION_ROM_RUN_REALMODE
 config PCI_OPTION_ROM_RUN_YABEL
        prompt "Secure mode"
        bool
+       depends on !GEODE_VSA
        help
          If you select this option, the x86emu CPU emulator will be used to
          execute PCI option ROMs.
@@ -74,63 +75,6 @@ config PCI_OPTION_ROM_RUN_YABEL
 
 endchoice
 
-# TODO: Describe better, and/or make a "choice" selection for this.
-config YABEL_DEBUG_FLAGS
-       prompt "Hex value for YABEL debug flags"
-       hex
-       default 0x0
-       depends on PCI_OPTION_ROM_RUN_YABEL
-       help
-         CONFIG_YABEL_DEBUG_FLAGS is a binary switch that allows you
-         to select the following items to debug. 1=on 0=off. After you
-         decide what you want to debug create the binary value, convert to
-         hex and set the option.
-
-         Example for "debug all":
-           CONFIG_YABEL_DEBUG_FLAGS = 0x31FF
-
-         |-DEBUG_JMP - Print info about JMP and RETF opcodes from x86emu
-         ||-DEBUG_TRACE_X86EMU - Print _all_ opcodes that are executed by
-         ||                      x86emu (WARNING: this will produce a LOT
-         ||                      of output)
-         |||-Currently unused
-         ||||-Currently unused
-         |||||-Currently unused
-         ||||||-DEBUG_PNP - Print Plug And Play accesses made by option ROM
-         |||||||-DEBUG_DISK - Print Disk I/O related messages, currently unused
-         ||||||||-DEBUG_PMM - Print messages related to POST Memory
-         ||||||||             Manager (PMM)
-         |||||||||-DEBUG_VBE - Print messages related to VESA BIOS Extension
-         |||||||||             (VBE) functions
-         ||||||||||-DEBUG_PRINT_INT10 - Let INT10 (i.e. character output)
-         ||||||||||                     calls print messages to debug output
-         |||||||||||-DEBUG_INTR - Print messages related to interrupt handling
-         ||||||||||||-DEBUG_CHECK_VMEM_ACCESS - Print messages related to
-         ||||||||||||                           accesses to certain areas of
-         ||||||||||||                           the virtual memory (e.g. BDA
-         ||||||||||||                           (BIOS Data Area) or interrupt
-         ||||||||||||                           vectors)
-         |||||||||||||-DEBUG_MEM - Print memory accesses made by option ROM
-         |||||||||||||             (NOTE: this also includes accesses to
-         |||||||||||||             fetch instructions)
-         ||||||||||||||-DEBUG_IO - Print I/O accesses made by option ROM
-         11000111111111 - Maximum binary value, i.e. "debug all"
-                          (WARNING: This could run for hours)
-
-         DEBUG_IO                      0x0001
-         DEBUG_MEM                     0x0002
-         DEBUG_CHECK_VMEM_ACCESS       0x0004
-         DEBUG_INTR                    0x0008
-         DEBUG_PRINT_INT10             0x0010
-         DEBUG_VBE                     0x0020
-         DEBUG_PMM                     0x0040
-         DEBUG_DISK                    0x0080
-         DEBUG_PNP                     0x0100
-         DEBUG_TRACE_X86EMU            0x1000
-         DEBUG_JMP                     0x2000
-
-         See debug.h for values. 0 is no debug output, 0x31ff is _verbose_.
-
 config YABEL_PCI_ACCESS_OTHER_DEVICES
        prompt "Allow option ROMs to access other devices"
        bool
@@ -150,6 +94,11 @@ config YABEL_VIRTMEM_LOCATION
          YABEL requires 1MB memory for its CPU emulation. This memory is
          normally located at 16MB.
 
+config YABEL_VIRTMEM_LOCATION
+       hex
+       depends on PCI_OPTION_ROM_RUN_YABEL && !EXPERT
+       default 0x1000000
+
 config YABEL_DIRECTHW
        prompt "Direct hardware access"
        bool
@@ -167,7 +116,7 @@ config YABEL_DIRECTHW
          they can still access all devices in the system.
          Enable this option for a good compromise between security and speed.
 
-config CONSOLE_VGA_MULTI
+config MULTIPLE_VGA_ADAPTERS
        bool
        default n