[PATCH] v3: Unbreak x86emu

[Carl-Daniel Hailfinger]

Hi,

the following change broke x86emu compilation on all v3 targets.
> r965 | rminnich
> [...]
> Also make the vm86 stuff use the SRC instead of OBJ names so we can
> see it in ks
> cope.
>
> Signed-off-by: Ronald G. Minnich 
> Acked-by: Stefan Reinauer

Fix the issue.OBJ->SRC conversions are a bit tricky to get right.

Signed-off-by: Carl-Daniel Hailfinger

Attached for gmail users.

Index: corebootv3-x86emu_makefile/util/x86emu/Makefile
===================================================================
--- corebootv3-x86emu_makefile/util/x86emu/Makefile	(Revision 988)
+++ corebootv3-x86emu_makefile/util/x86emu/Makefile	(Arbeitskopie)
@@ -23,7 +23,7 @@
 VM86_SRC    = vm86.c vm86_gdt.c

ifeq ($(CONFIG_PCI_OPTION_ROM_RUN_X86EMU),y)
-LIBX86EMU_SRC=$(X86EMU_SRC) $(BIOSEMU_SRC)
+LIBX86EMU_SRC=$(patsubst %,x86emu/%,$(X86EMU_SRC)) $(BIOSEMU_SRC)
 endif

ifeq ($(CONFIG_PCI_OPTION_ROM_RUN_VM86),y)

[ron minnich]

Acked-by: Ronald G. Minnich

Weirdly, nothing has broken for me ...

ron

On Sat, Nov 8, 2008 at 4:35 PM, Carl-Daniel Hailfinger
 wrote:
> Hi,
>
> the following change broke x86emu compilation on all v3 targets.
> > r965 | rminnich
> > [...]
> > Also make the vm86 stuff use the SRC instead of OBJ names so we can
> > see it in ks
> > cope.
> >
> > Signed-off-by: Ronald G. Minnich 
> > Acked-by: Stefan Reinauer
>
> Fix the issue.OBJ->SRC conversions are a bit tricky to get right.
>
> Signed-off-by: Carl-Daniel Hailfinger
>
> Attached for gmail users.
> Index: corebootv3-x86emu_makefile/util/x86emu/Makefile
>
> --- corebootv3-x86emu_makefile/util/x86emu/Makefile     (Revision 988)
> +++ corebootv3-x86emu_makefile/util/x86emu/Makefile     (Arbeitskopie)
> @@ -23,7 +23,7 @@
>  VM86_SRC    = vm86.c vm86_gdt.c
>
> ifeq ($(CONFIG_PCI_OPTION_ROM_RUN_X86EMU),y)
> -LIBX86EMU_SRC=$(X86EMU_SRC) $(BIOSEMU_SRC)
> +LIBX86EMU_SRC=$(patsubst %,x86emu/%,$(X86EMU_SRC)) $(BIOSEMU_SRC)
>  endif
>
> ifeq ($(CONFIG_PCI_OPTION_ROM_RUN_VM86),y)

[Carl-Daniel Hailfinger]

On 09.11.2008 01:40, ron minnich wrote:
> Acked-by: Ronald G. Minnich

Thanks, r989.
> Weirdly, nothing has broken for me ...

Configure for Qemu, everything default, "Devices"--> "Execute PCI Option
ROMs" --> "x86emu" and watch compilation fail.

The underlying problem was that some of the object files were living in
util/x86emu/x86emu, but after the OBJ->SRC conversion, the makefile
assumed all object files lived in util/x86emu (one level up).

Regards,
Carl-Daniel
> On Sat, Nov 8, 2008 at 4:35 PM, Carl-Daniel Hailfinger wrote:
> > Hi,
> >
> > the following change broke x86emu compilation on all v3 targets.
> > > r965 | rminnich
> > > [...]
> > > Also make the vm86 stuff use the SRC instead of OBJ names so we can
> > > see it in ks
> > > cope.
> > >
> > > Signed-off-by: Ronald G. Minnich 
> > > Acked-by: Stefan Reinauer
> >
> > Fix the issue.OBJ->SRC conversions are a bit tricky to get right.
> >
> > Signed-off-by: Carl-Daniel Hailfinger