Re: [coreboot] [v3] r1170 - coreboot-v3/util/x86emu

[René Reuter]

This fix is breaking v2 when running it with emulation mainboard qemu-x86:

Output Log:

CBFS:  Could not find file pci1013,00b8.rom
In cbfs, rom address for PCI: 00:02.0 = 00000000
On mainboard, rom address for PCI: 00:02.0 = c0000
copying VGA ROM Image from 000c0000 to 0xc0000, 0x8c00 bytes
Calling Option Rom...
oprom: INT# 0x0
oprom: eax: 00000000 ebx: 0001444c ecx: 00013ff4 edx: 0001444c
oprom: ebp: 00013f50 esp: 00000ffa edi: 0000ea44 esi: 0001444c
oprom:  ip: 0556      cs: 0000   flags: 00000246
Oops, exception 0 while executing option rom
Unexpected Exception: 0 @ 00:00000556 - Halting
Code: 0 eflags: 00000246
eax: 00000000 ebx: 0001444c ecx: 00013ff4 edx: 0001444c
edi: 0000ea44 esi: 0001444c ebp: 00013f50 esp: 00000ffa

And here it keeps holding. With older revisions v2 works fine.

Regards,

René

2009/5/29
> Author: linux_junkie
> Date: 2009-05-29 20:42:23 +0200 (Fri, 29 May 2009)
> New Revision: 1170
>
> Modified:
>   coreboot-v3/util/x86emu/Config.lb
>   coreboot-v3/util/x86emu/Makefile
> Log:
> 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
> Modified: coreboot-v3/util/x86emu/Config.lb
>
> --- coreboot-v3/util/x86emu/Config.lb   2009-05-29 17:38:46 UTC (rev 1169)
> +++ coreboot-v3/util/x86emu/Config.lb   2009-05-29 18:42:23 UTC (rev 1170)
> @@ -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
> Modified: coreboot-v3/util/x86emu/Makefile
>
> --- coreboot-v3/util/x86emu/Makefile    2009-05-29 17:38:46 UTC (rev 1169)
> +++ coreboot-v3/util/x86emu/Makefile    2009-05-29 18:42:23 UTC (rev 1170)
> @@ -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))