From f1fae638c17b9177e032483d4c602510013faad1 Mon Sep 17 00:00:00 2001 From: Joseph Smith Date: Fri, 29 May 2009 18:42:23 +0000 Subject: rename the option CONFIG_PCI_OPTION_ROM_RUN_VM86 to CONFIG_PCI_OPTION_ROM_RUN_REALMODE. Signed-off-by: Joseph Smith Acked-by: Stefan Reinauer git-svn-id: svn://coreboot.org/repository/coreboot-v3@1170 f3766cd6-281f-0410-b1cd-43a5c92072e9 --- util/x86emu/Config.lb | 4 ++-- util/x86emu/Makefile | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/util/x86emu/Config.lb b/util/x86emu/Config.lb index 0721ecdfcd23..e5b4b3a2310b 100644 --- a/util/x86emu/Config.lb +++ b/util/x86emu/Config.lb @@ -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 diff --git a/util/x86emu/Makefile b/util/x86emu/Makefile index 3cc985a8c6fd..2c915d466bd5 100644 --- a/util/x86emu/Makefile +++ b/util/x86emu/Makefile @@ -37,7 +37,7 @@ X86EMU_INCLUDE += -I $(src)/util/x86emu #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 @@ ifeq ($(CONFIG_PCI_OPTION_ROM_RUN_YABEL),y) 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)) -- cgit v1.2.3