[v3] r1171 - in coreboot-v3: device mainboard/amd/serengeti mainboard/emulation/qemu-x86 mainboard/pcengines/alix1c mainboard/pcengines/alix2c3

Author: stepan
Date: 2009-06-07 19:36:43 +0200 (Sun, 07 Jun 2009)
New Revision: 1171

Modified:
   coreboot-v3/device/Kconfig
   coreboot-v3/mainboard/amd/serengeti/defconfig
   coreboot-v3/mainboard/emulation/qemu-x86/defconfig
   coreboot-v3/mainboard/pcengines/alix1c/defconfig
   coreboot-v3/mainboard/pcengines/alix2c3/defconfig
Log:
rename VM86 to REALMODE in v3, too, as that is what it really is.
(trivial)

Signed-off-by: Stefan Reinauer 
Acked-by: Stefan Reinauer

Modified: coreboot-v3/device/Kconfig
===================================================================
--- coreboot-v3/device/Kconfig	2009-05-29 18:42:23 UTC (rev 1170)
+++ coreboot-v3/device/Kconfig	2009-06-07 17:36:43 UTC (rev 1171)
@@ -25,12 +25,12 @@
    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 @@
      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"

Modified: coreboot-v3/mainboard/amd/serengeti/defconfig
===================================================================
--- coreboot-v3/mainboard/amd/serengeti/defconfig	2009-05-29 18:42:23 UTC (rev 1170)
+++ coreboot-v3/mainboard/amd/serengeti/defconfig	2009-06-07 17:36:43 UTC (rev 1171)
@@ -102,7 +102,7 @@
 # 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

#

Modified: coreboot-v3/mainboard/emulation/qemu-x86/defconfig
===================================================================
--- coreboot-v3/mainboard/emulation/qemu-x86/defconfig	2009-05-29 18:42:23 UTC (rev 1170)
+++ coreboot-v3/mainboard/emulation/qemu-x86/defconfig	2009-06-07 17:36:43 UTC (rev 1171)
@@ -74,7 +74,7 @@
 #
 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

Modified: coreboot-v3/mainboard/pcengines/alix1c/defconfig
===================================================================
--- coreboot-v3/mainboard/pcengines/alix1c/defconfig	2009-05-29 18:42:23 UTC (rev 1170)
+++ coreboot-v3/mainboard/pcengines/alix1c/defconfig	2009-06-07 17:36:43 UTC (rev 1171)
@@ -82,7 +82,7 @@
 #
 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

Modified: coreboot-v3/mainboard/pcengines/alix2c3/defconfig
===================================================================
--- coreboot-v3/mainboard/pcengines/alix2c3/defconfig	2009-05-29 18:42:23 UTC (rev 1170)
+++ coreboot-v3/mainboard/pcengines/alix2c3/defconfig	2009-06-07 17:36:43 UTC (rev 1171)
@@ -75,7 +75,7 @@
 #
 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