Author: stepan Date: 2009-08-27 13:34:09 +0200 (Thu, 27 Aug 2009) New Revision: 4594
Removed: trunk/coreboot-v2/src/include/x86emu/ Modified: trunk/coreboot-v2/src/config/Config.lb trunk/coreboot-v2/util/x86emu/include/x86emu/x86emu.h trunk/coreboot-v2/util/x86emu/x86emu/Config.lb Log: 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
Modified: trunk/coreboot-v2/src/config/Config.lb =================================================================== --- trunk/coreboot-v2/src/config/Config.lb 2009-08-27 11:23:06 UTC (rev 4593) +++ trunk/coreboot-v2/src/config/Config.lb 2009-08-27 11:34:09 UTC (rev 4594) @@ -10,7 +10,7 @@ makedefine GCC_INC_DIR := $(shell LC_ALL=C $(GCC) -print-search-dirs | sed -ne "s/install: (.*)/\1include/gp")
makedefine CPPFLAGS := -I$(TOP)/src/include -I$(TOP)/src/arch/$(CONFIG_ARCH)/include -I$(GCC_INC_DIR) $(CPUFLAGS) -makedefine CFLAGS := $(CONFIG_CPU_OPT) $(DISTRO_CFLAGS) $(CPPFLAGS) -Os -nostdinc -nostdlib -Wall -Wundef -Wstrict-prototypes -Wmissing-prototypes -Wwrite-strings -Wredundant-decls -Wno-trigraphs -Werror-implicit-function-declaration -Wstrict-aliasing -Wshadow -fno-common -ffreestanding -fno-builtin -fomit-frame-pointer +makedefine CFLAGS = $(CONFIG_CPU_OPT) $(DISTRO_CFLAGS) $(CPPFLAGS) -Os -nostdinc -nostdlib -Wall -Wundef -Wstrict-prototypes -Wmissing-prototypes -Wwrite-strings -Wredundant-decls -Wno-trigraphs -Werror-implicit-function-declaration -Wstrict-aliasing -Wshadow -fno-common -ffreestanding -fno-builtin -fomit-frame-pointer
if CONFIG_ASSEMBLER_DEBUG makedefine DEBUG_CFLAGS := -g -dA -fverbose-asm
Modified: trunk/coreboot-v2/util/x86emu/include/x86emu/x86emu.h =================================================================== --- trunk/coreboot-v2/util/x86emu/include/x86emu/x86emu.h 2009-08-27 11:23:06 UTC (rev 4593) +++ trunk/coreboot-v2/util/x86emu/include/x86emu/x86emu.h 2009-08-27 11:34:09 UTC (rev 4594) @@ -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 @@
#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()
Modified: trunk/coreboot-v2/util/x86emu/x86emu/Config.lb =================================================================== --- trunk/coreboot-v2/util/x86emu/x86emu/Config.lb 2009-08-27 11:23:06 UTC (rev 4593) +++ trunk/coreboot-v2/util/x86emu/x86emu/Config.lb 2009-08-27 11:34:09 UTC (rev 4594) @@ -1,3 +1,5 @@ +makedefine CPPFLAGS += -I$(TOP)/util/x86emu/include + object debug.o object decode.o object fpu.o