This patch changes the default rom emulator to VM86.

Signed-off-by: Joseph Smith <joe@settoplinux.org>
Acked-by: Myles Watson <mylesgw@gmail.com>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4245 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

diff --git a/src/mainboard/rca/rm4100/Options.lb b/src/mainboard/rca/rm4100/Options.lb
index 0272905da2ec64c4dfedb3f14e35ebb4ef8e4721..2bdf77149931fc7089aafd273412d1d6aa628990 100644 (file)
--- a/src/mainboard/rca/rm4100/Options.lb
+++ b/src/mainboard/rca/rm4100/Options.lb
@@ -24,6 +24,7 @@ uses CONFIG_CONSOLE_SERIAL8250
 uses CONFIG_CONSOLE_VGA
 uses CONFIG_COMPRESSED_PAYLOAD_LZMA
 uses CONFIG_IOAPIC
+uses CONFIG_PCI_OPTION_ROM_RUN_VM86
 uses CONFIG_PCI_ROM_RUN
 uses CONFIG_ROM_PAYLOAD
 uses CONFIG_ROM_PAYLOAD_START
@@ -78,6 +79,7 @@ default CONFIG_IOAPIC = 0
 default HAVE_OPTION_TABLE = 0
 default CONFIG_CONSOLE_VGA = 0
 default CONFIG_PCI_ROM_RUN = 0
+default CONFIG_PCI_OPTION_ROM_RUN_VM86 = 0
 default CONFIG_VIDEO_MB = 0
 default STACK_SIZE = 0x2000
 default HEAP_SIZE = 0x4000

diff --git a/src/mainboard/thomson/ip1000/Options.lb b/src/mainboard/thomson/ip1000/Options.lb
index 8b47189cced7cd4057ebccba4d425d51e5da3b39..08cb033ab9c712eba4b7f4a754f3080a30c52aba 100644 (file)
--- a/src/mainboard/thomson/ip1000/Options.lb
+++ b/src/mainboard/thomson/ip1000/Options.lb
@@ -24,6 +24,7 @@ uses CONFIG_CONSOLE_SERIAL8250
 uses CONFIG_CONSOLE_VGA
 uses CONFIG_COMPRESSED_PAYLOAD_LZMA
 uses CONFIG_IOAPIC
+uses CONFIG_PCI_OPTION_ROM_RUN_VM86
 uses CONFIG_PCI_ROM_RUN
 uses CONFIG_ROM_PAYLOAD
 uses CONFIG_ROM_PAYLOAD_START
@@ -78,6 +79,7 @@ default CONFIG_IOAPIC = 0
 default HAVE_OPTION_TABLE = 0
 default CONFIG_CONSOLE_VGA = 0
 default CONFIG_PCI_ROM_RUN = 0
+default CONFIG_PCI_OPTION_ROM_RUN_VM86 = 0
 default CONFIG_VIDEO_MB = 0
 default STACK_SIZE = 0x2000
 default HEAP_SIZE = 0x4000

diff --git a/targets/rca/rm4100/Config.lb b/targets/rca/rm4100/Config.lb
index e5978716e3ff3acb901e4b27a04ef2d3ac967d76..35ff7558e3eb823433e588686af0043c030eed56 100644 (file)
--- a/targets/rca/rm4100/Config.lb
+++ b/targets/rca/rm4100/Config.lb
@@ -37,6 +37,7 @@ option ROM_SIZE = (1024 * 1024) - (64 * 1024)
 ##
 option CONFIG_CONSOLE_VGA = 1
 option CONFIG_PCI_ROM_RUN = 1
+option CONFIG_PCI_OPTION_ROM_RUN_VM86 = 1
 
 ##
 ## Choose the amount of memory pre-allocated for VGA

diff --git a/targets/thomson/ip1000/Config.lb b/targets/thomson/ip1000/Config.lb
index 0ee8b7a1e79ca410be0b386cad279b90f1667d3f..aa507394d567b499ba9ae032cfb1fe64155d963a 100644 (file)
--- a/targets/thomson/ip1000/Config.lb
+++ b/targets/thomson/ip1000/Config.lb
@@ -37,6 +37,7 @@ option ROM_SIZE = (1024 * 1024) - (64 * 1024)
 ##
 option CONFIG_CONSOLE_VGA = 1
 option CONFIG_PCI_ROM_RUN = 1
+option CONFIG_PCI_OPTION_ROM_RUN_VM86 = 1
 
 ##
 ## Choose the amount of memory pre-allocated for VGA