diff options
| author | Stefan Reinauer <stepan@coresystems.de> | 2009-08-27 11:34:09 +0000 |
|---|---|---|
| committer | Stefan Reinauer <stepan@openbios.org> | 2009-08-27 11:34:09 +0000 |
| commit | 6c36305cdf866aa6c5136f303c98d389b1c1504e (patch) | |
| tree | cc7abb7a66770cb1efc8188db5923f796e6ab164 /util | |
| parent | b883d4c433e39bfeb12060bc7c2662d099d0534d (diff) | |
coreboot was still using an old set (obsolete since yabel) of x86emu includes
instead of the versions in util/x86emu. Clean up this mess.
Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4594 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'util')
| -rw-r--r-- | util/x86emu/include/x86emu/x86emu.h | 11 | ||||
| -rw-r--r-- | util/x86emu/x86emu/Config.lb | 2 |
2 files changed, 8 insertions, 5 deletions
diff --git a/util/x86emu/include/x86emu/x86emu.h b/util/x86emu/include/x86emu/x86emu.h index 6101e57d13..141e27f444 100644 --- a/util/x86emu/include/x86emu/x86emu.h +++ b/util/x86emu/include/x86emu/x86emu.h @@ -42,10 +42,11 @@ #ifndef __X86EMU_X86EMU_H #define __X86EMU_X86EMU_H -/* FIXME: undefine printk for the moment */ -#if 1 /* Coreboot needs to map prinkf to printk. */ -#include <console.h> -#define printk(x...) printk(BIOS_DEBUG, x) +/* FIXME: redefine printk for the moment */ +#ifdef COREBOOT_V2 +#include <console/console.h> +#undef printk +#define printk(x...) do_printk(BIOS_DEBUG, x) #else #define printk printf #endif @@ -165,7 +166,7 @@ void X86EMU_halt_sys(void); #ifdef CONFIG_DEBUG #define HALT_SYS() \ - printk("halt_sys: file %s, line %d\n", __FILE__, __LINE__); \ + printk("halt_sys: in %s\n", __func__); \ X86EMU_halt_sys(); #else #define HALT_SYS() X86EMU_halt_sys() diff --git a/util/x86emu/x86emu/Config.lb b/util/x86emu/x86emu/Config.lb index 20e8072204..f5ca6d7237 100644 --- a/util/x86emu/x86emu/Config.lb +++ b/util/x86emu/x86emu/Config.lb @@ -1,3 +1,5 @@ +makedefine CPPFLAGS += -I$(TOP)/util/x86emu/include + object debug.o object decode.o object fpu.o |