diff options
| -rw-r--r-- | device/Kconfig | 18 | ||||
| -rw-r--r-- | mainboard/amd/serengeti/defconfig | 2 | ||||
| -rw-r--r-- | mainboard/emulation/qemu-x86/defconfig | 2 | ||||
| -rw-r--r-- | mainboard/pcengines/alix1c/defconfig | 2 | ||||
| -rw-r--r-- | mainboard/pcengines/alix2c3/defconfig | 2 |
5 files changed, 13 insertions, 13 deletions
diff --git a/device/Kconfig b/device/Kconfig index 2fa99276de35..a2c1d7bea09a 100644 --- a/device/Kconfig +++ b/device/Kconfig @@ -25,12 +25,12 @@ config PCI_OPTION_ROM_RUN help Execute PCI/AGP option ROMs if available. This is required to enable PCI/AGP VGA plugin cards. This option is not exposed - to the user but set by the options PCI_OPTION_ROM_RUN_VM86 - , PCI_OPTION_ROM_RUN_X86EMU and PCI_OPTION_ROM_RUN_YABEL. + to the user but set by the options PCI_OPTION_ROM_RUN_REALMODE, + PCI_OPTION_ROM_RUN_X86EMU and PCI_OPTION_ROM_RUN_YABEL. choice prompt "Execute PCI Option ROMs" - default PCI_OPTION_ROM_RUN_VM86 + default PCI_OPTION_ROM_RUN_REALMODE help Execute PCI/AGP option ROMs if available. You can choose to execute PCI option ROMs natively (32bit x86 system required), @@ -63,17 +63,17 @@ config PCI_OPTION_ROM_RUN_YABEL All 16bit x86 code is executed in an encapsulated environment where it can not break out. -config PCI_OPTION_ROM_RUN_VM86 - bool "vm86" +config PCI_OPTION_ROM_RUN_REALMODE + bool "realmode" select PCI_OPTION_ROM_RUN depends ARCH_X86 help - If you choose this option, the virtual x86 mode "vm86" is used + If you choose this option, the x86 real mode is used to execute 16bit legacy BIOS option ROMs. - vm86 is very small, fast, and probably a little less safe than - x86emu, since it runs option ROMs on the real hardware instead - of an emulator. + The realmode trampoline code is very small, fast, and probably a + little less safe but a little more compatible than x86emu, since it + runs option ROMs on the real hardware instead of an emulator. config PCI_OPTION_ROM_RUN_NONE bool "Disabled" diff --git a/mainboard/amd/serengeti/defconfig b/mainboard/amd/serengeti/defconfig index 28e0a343112f..e3aff49090b7 100644 --- a/mainboard/amd/serengeti/defconfig +++ b/mainboard/amd/serengeti/defconfig @@ -102,7 +102,7 @@ CONFIG_CONSOLE_SERIAL_115200=y # Devices # # CONFIG_PCI_OPTION_ROM_RUN_X86EMU is not set -# CONFIG_PCI_OPTION_ROM_RUN_VM86 is not set +# CONFIG_PCI_OPTION_ROM_RUN_REALMODE is not set CONFIG_PCI_OPTION_ROM_RUN_NONE=y # diff --git a/mainboard/emulation/qemu-x86/defconfig b/mainboard/emulation/qemu-x86/defconfig index 1a14dfadd2a1..488f4f7610cd 100644 --- a/mainboard/emulation/qemu-x86/defconfig +++ b/mainboard/emulation/qemu-x86/defconfig @@ -74,7 +74,7 @@ CONFIG_CONSOLE_BUFFER=y # CONFIG_PCI_OPTION_ROM_RUN=y # CONFIG_PCI_OPTION_ROM_RUN_X86EMU is not set -CONFIG_PCI_OPTION_ROM_RUN_VM86=y +CONFIG_PCI_OPTION_ROM_RUN_REALMODE=y # CONFIG_PCI_OPTION_ROM_RUN_NONE is not set # CONFIG_MULTIPLE_VGA_INIT is not set # CONFIG_INITIALIZE_ONBOARD_VGA_FIRST is not set diff --git a/mainboard/pcengines/alix1c/defconfig b/mainboard/pcengines/alix1c/defconfig index f3b03c5ea142..aa23b25831db 100644 --- a/mainboard/pcengines/alix1c/defconfig +++ b/mainboard/pcengines/alix1c/defconfig @@ -82,7 +82,7 @@ CONFIG_CONSOLE_SERIAL_115200=y # CONFIG_PCI_OPTION_ROM_RUN=y # CONFIG_PCI_OPTION_ROM_RUN_X86EMU is not set -CONFIG_PCI_OPTION_ROM_RUN_VM86=y +CONFIG_PCI_OPTION_ROM_RUN_REALMODE=y # CONFIG_PCI_OPTION_ROM_RUN_NONE is not set # CONFIG_MULTIPLE_VGA_INIT is not set # CONFIG_INITIALIZE_ONBOARD_VGA_FIRST is not set diff --git a/mainboard/pcengines/alix2c3/defconfig b/mainboard/pcengines/alix2c3/defconfig index 496d02c7a415..e5515579a220 100644 --- a/mainboard/pcengines/alix2c3/defconfig +++ b/mainboard/pcengines/alix2c3/defconfig @@ -75,7 +75,7 @@ CONFIG_CONSOLE_BUFFER=y # CONFIG_PCI_OPTION_ROM_RUN=y # CONFIG_PCI_OPTION_ROM_RUN_X86EMU is not set -CONFIG_PCI_OPTION_ROM_RUN_VM86=y +CONFIG_PCI_OPTION_ROM_RUN_REALMODE=y # CONFIG_PCI_OPTION_ROM_RUN_NONE is not set # CONFIG_MULTIPLE_VGA_INIT is not set # CONFIG_INITIALIZE_ONBOARD_VGA_FIRST is not set |