diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/devices/Kconfig | 54 | ||||
| -rw-r--r-- | src/devices/Makefile.inc | 4 |
2 files changed, 34 insertions, 24 deletions
diff --git a/src/devices/Kconfig b/src/devices/Kconfig index 2b58f91751..37ff9b927c 100644 --- a/src/devices/Kconfig +++ b/src/devices/Kconfig @@ -21,34 +21,44 @@ menu "Devices" config VGA_ROM_RUN - bool + bool "Run VGA Option ROMs" help - Execute PCI/AGP option ROMs if available. This is required to - enable PCI/AGP VGA plugin cards. + Execute VGA option ROMs if found. This is required to enable PCI/AGP + VGA plugin cards. -choice - prompt "Execute PCI option ROMs" - default PCI_OPTION_ROM_RUN_REALMODE +config PCI_ROM_RUN + bool "Run non-VGA Option ROMs" help - Execute PCI/AGP option ROMs if available. You can choose to - execute PCI option ROMs natively (32bit x86 system required), - in an emulator (x86emu), or ignore option ROM execution. + Execute non-VGA PCI option ROMs if found. -config PCI_OPTION_ROM_RUN_REALMODE - prompt "Run VGA ROMs" - bool - select VGA_ROM_RUN - help - Execute PCI/AGP option ROMs if available. This is required to - enable PCI/AGP VGA plugin cards. +choice + prompt "Option ROM Execution" + default PCI_OPTION_ROM_RUN_REALMODE + depends on PCI_ROM_RUN || VGA_ROM_RUN + help + You can choose to execute PCI option ROMs natively (32bit x86 system + required) or in an emulator (x86emu or YABEL). + + config PCI_OPTION_ROM_RUN_REALMODE + prompt "Real mode" + bool + + config PCI_OPTION_ROM_RUN_YABEL + prompt "YABEL" + bool + + config PCI_OPTION_ROM_RUN_X86EMU + prompt "X86EMU" + bool +endchoice -config NO_RUN - prompt "Do NOT run VGA ROMs" - bool +config YABEL_DEBUG_FLAGS + prompt "Hex value for debug flags" + hex + default 0x0 + depends on PCI_OPTION_ROM_RUN_YABEL help - Do not execute PCI/AGP option ROMs. - -endchoice + See debug.h for values 0 is no debug output, 0x31ff is _verbose_. endmenu diff --git a/src/devices/Makefile.inc b/src/devices/Makefile.inc index 9ef4e69517..0c6677a57b 100644 --- a/src/devices/Makefile.inc +++ b/src/devices/Makefile.inc @@ -12,8 +12,8 @@ obj-y += pci_ops.o obj-y += smbus_ops.o ifeq ($(CONFIG_PCI_ROM_RUN),y) -obj-$(CONFIG_PCI_ROM_RUN) += pci_rom.o -subdirs-$(CONFIG_PCI_ROM_RUN) += ../../util/x86emu +obj-y += pci_rom.o +subdirs-y += ../../util/x86emu else obj-$(CONFIG_VGA_ROM_RUN) += pci_rom.o subdirs-$(CONFIG_VGA_ROM_RUN) += ../../util/x86emu |