Here is patches to rename the option CONFIG_PCI_OPTION_ROM_RUN_VM86 to
CONFIG_PCI_OPTION_ROM_RUN_REALMODE.
abuild tested
Signed-off-by: Joseph Smith <[email protected]>
--
Thanks,
Joseph Smith
Set-Top-Linux
www.settoplinux.org
Index: src/mainboard/thomson/ip1000/Options.lb
===================================================================
--- src/mainboard/thomson/ip1000/Options.lb (revision 4324)
+++ src/mainboard/thomson/ip1000/Options.lb (working copy)
@@ -24,7 +24,7 @@
uses CONFIG_CONSOLE_VGA
uses CONFIG_COMPRESSED_PAYLOAD_LZMA
uses CONFIG_IOAPIC
-uses CONFIG_PCI_OPTION_ROM_RUN_VM86
+uses CONFIG_PCI_OPTION_ROM_RUN_REALMODE
uses CONFIG_PCI_ROM_RUN
uses CONFIG_ROM_PAYLOAD
uses CONFIG_ROM_PAYLOAD_START
@@ -79,7 +79,7 @@
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_PCI_OPTION_ROM_RUN_REALMODE = 0
default CONFIG_VIDEO_MB = 0
default STACK_SIZE = 0x2000
default HEAP_SIZE = 0x4000
Index: src/mainboard/emulation/qemu-x86/Options.lb
===================================================================
--- src/mainboard/emulation/qemu-x86/Options.lb (revision 4324)
+++ src/mainboard/emulation/qemu-x86/Options.lb (working copy)
@@ -37,7 +37,7 @@
uses HOSTCC
uses OBJCOPY
uses CONFIG_PCI_ROM_RUN
-uses CONFIG_PCI_OPTION_ROM_RUN_VM86
+uses CONFIG_PCI_OPTION_ROM_RUN_REALMODE
uses CONFIG_CONSOLE_SERIAL8250
uses USE_DCACHE_RAM
@@ -92,7 +92,7 @@
## Option ROM init
##
default CONFIG_PCI_ROM_RUN=1
-default CONFIG_PCI_OPTION_ROM_RUN_VM86=1
+default CONFIG_PCI_OPTION_ROM_RUN_REALMODE=1
###
### coreboot layout values
Index: src/mainboard/rca/rm4100/Options.lb
===================================================================
--- src/mainboard/rca/rm4100/Options.lb (revision 4324)
+++ src/mainboard/rca/rm4100/Options.lb (working copy)
@@ -24,7 +24,7 @@
uses CONFIG_CONSOLE_VGA
uses CONFIG_COMPRESSED_PAYLOAD_LZMA
uses CONFIG_IOAPIC
-uses CONFIG_PCI_OPTION_ROM_RUN_VM86
+uses CONFIG_PCI_OPTION_ROM_RUN_REALMODE
uses CONFIG_PCI_ROM_RUN
uses CONFIG_ROM_PAYLOAD
uses CONFIG_ROM_PAYLOAD_START
@@ -79,7 +79,7 @@
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_PCI_OPTION_ROM_RUN_REALMODE = 0
default CONFIG_VIDEO_MB = 0
default STACK_SIZE = 0x2000
default HEAP_SIZE = 0x4000
Index: src/config/Options.lb
===================================================================
--- src/config/Options.lb (revision 4324)
+++ src/config/Options.lb (working copy)
@@ -1114,7 +1114,7 @@
end
-define CONFIG_PCI_OPTION_ROM_RUN_VM86
+define CONFIG_PCI_OPTION_ROM_RUN_REALMODE
default 0
export used
comment "Use Yabel instead of old bios emulator"
Index: targets/thomson/ip1000/Config.lb
===================================================================
--- targets/thomson/ip1000/Config.lb (revision 4324)
+++ targets/thomson/ip1000/Config.lb (working copy)
@@ -37,7 +37,7 @@
##
option CONFIG_CONSOLE_VGA = 1
option CONFIG_PCI_ROM_RUN = 1
-option CONFIG_PCI_OPTION_ROM_RUN_VM86 = 1
+option CONFIG_PCI_OPTION_ROM_RUN_REALMODE = 1
##
## Choose the amount of memory pre-allocated for VGA
Index: targets/rca/rm4100/Config.lb
===================================================================
--- targets/rca/rm4100/Config.lb (revision 4324)
+++ targets/rca/rm4100/Config.lb (working copy)
@@ -37,7 +37,7 @@
##
option CONFIG_CONSOLE_VGA = 1
option CONFIG_PCI_ROM_RUN = 1
-option CONFIG_PCI_OPTION_ROM_RUN_VM86 = 1
+option CONFIG_PCI_OPTION_ROM_RUN_REALMODE = 1
##
## Choose the amount of memory pre-allocated for VGA
Index: util/x86emu/Config.lb
===================================================================
--- util/x86emu/Config.lb (revision 1169)
+++ util/x86emu/Config.lb (working copy)
@@ -1,11 +1,11 @@
uses CONFIG_PCI_OPTION_ROM_RUN_YABEL
-uses CONFIG_PCI_OPTION_ROM_RUN_VM86
+uses CONFIG_PCI_OPTION_ROM_RUN_REALMODE
if CONFIG_PCI_OPTION_ROM_RUN_YABEL
dir yabel
dir x86emu
else
- if CONFIG_PCI_OPTION_ROM_RUN_VM86
+ if CONFIG_PCI_OPTION_ROM_RUN_REALMODE
object x86.o
object x86_interrupts.o
object x86_asm.S
Index: util/x86emu/Makefile
===================================================================
--- util/x86emu/Makefile (revision 1169)
+++ util/x86emu/Makefile (working copy)
@@ -37,7 +37,7 @@
#TODO: remove these, these are .h files from slof, to make the merge easier...
X86EMU_INCLUDE += -I $(src)/util/x86emu/yabel/compat
endif
-VM86_SRC = x86.c x86_asm.S
+REALMODE_SRC = x86.c x86_asm.S
ifeq ($(CONFIG_PCI_OPTION_ROM_RUN_X86EMU),y)
LIBX86EMU_SRC=$(patsubst %,x86emu/%,$(X86EMU_SRC)) $(BIOSEMU_SRC)
@@ -47,8 +47,8 @@
LIBX86EMU_SRC=$(patsubst %,x86emu/%,$(X86EMU_SRC)) $(patsubst %,yabel/%,$(BIOSEMU_SRC))
endif
-ifeq ($(CONFIG_PCI_OPTION_ROM_RUN_VM86),y)
-LIBX86EMU_SRC=$(VM86_SRC)
+ifeq ($(CONFIG_PCI_OPTION_ROM_RUN_REALMODE),y)
+LIBX86EMU_SRC=$(REALMODE_SRC)
endif
LIBX86EMU_OBJS = $(patsubst %.c,$(obj)/util/x86emu/%.o,$(LIBX86EMU_SRC))
--
coreboot mailing list: [email protected]
http://www.coreboot.org/mailman/listinfo/coreboot
