diff options
author | Stefan Reinauer <stepan@coresystems.de> | 2010-01-19 21:13:44 +0000 |
---|---|---|
committer | Stefan Reinauer <stepan@openbios.org> | 2010-01-19 21:13:44 +0000 |
commit | 8ed1b6d2dc16b25334dff13033843b8c7f125f83 (patch) | |
tree | be5210211a638873f15592bd7babfea6dcf80961 /util/x86emu/yabel | |
parent | d5663bac2c6b2cea2f8c5fa4bd972517325af13b (diff) |
drop COREBOOT_V2 and COREBOOT_V4 define. We're not sharing code with v3
anymore so this ugly hack is no longer needed.
Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Peter Stuge <peter@stuge.se>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5040 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'util/x86emu/yabel')
-rw-r--r-- | util/x86emu/yabel/biosemu.c | 11 | ||||
-rw-r--r-- | util/x86emu/yabel/compat/functions.c | 3 | ||||
-rw-r--r-- | util/x86emu/yabel/debug.c | 4 | ||||
-rw-r--r-- | util/x86emu/yabel/debug.h | 4 | ||||
-rw-r--r-- | util/x86emu/yabel/device.c | 8 | ||||
-rw-r--r-- | util/x86emu/yabel/device.h | 6 | ||||
-rw-r--r-- | util/x86emu/yabel/interrupt.c | 12 | ||||
-rw-r--r-- | util/x86emu/yabel/io.c | 8 | ||||
-rw-r--r-- | util/x86emu/yabel/mem.c | 7 | ||||
-rw-r--r-- | util/x86emu/yabel/pmm.c | 4 | ||||
-rw-r--r-- | util/x86emu/yabel/vbe.c | 7 |
11 files changed, 1 insertions, 73 deletions
diff --git a/util/x86emu/yabel/biosemu.c b/util/x86emu/yabel/biosemu.c index 04c440d0a6..096af16688 100644 --- a/util/x86emu/yabel/biosemu.c +++ b/util/x86emu/yabel/biosemu.c @@ -14,19 +14,12 @@ #include <string.h> #include <types.h> -#ifndef CONFIG_COREBOOT_V2 -#include <cpu.h> -#endif #include "debug.h" #include <x86emu/x86emu.h> #include <x86emu/regs.h> -#ifdef CONFIG_COREBOOT_V2 #include "../x86emu/prim_ops.h" -#else -#include <x86emu/prim_ops.h> // for push_word -#endif #include "biosemu.h" #include "io.h" @@ -35,11 +28,7 @@ #include "device.h" #include "pmm.h" -#ifdef CONFIG_COREBOOT_V2 #include "compat/rtas.h" -#else -#include <rtas.h> -#endif #include <device/device.h> diff --git a/util/x86emu/yabel/compat/functions.c b/util/x86emu/yabel/compat/functions.c index 904f786bf6..600b0ba38a 100644 --- a/util/x86emu/yabel/compat/functions.c +++ b/util/x86emu/yabel/compat/functions.c @@ -14,9 +14,6 @@ */ #include <types.h> -#ifndef CONFIG_COREBOOT_V2 -#include <config.h> -#endif #include <string.h> #include <device/device.h> diff --git a/util/x86emu/yabel/debug.c b/util/x86emu/yabel/debug.c index fdac469d7f..7cda8af0b1 100644 --- a/util/x86emu/yabel/debug.c +++ b/util/x86emu/yabel/debug.c @@ -11,10 +11,6 @@ * IBM Corporation - initial implementation *****************************************************************************/ -#ifndef CONFIG_COREBOOT_V2 -#include <cpu.h> -#endif - #include "debug.h" u32 debug_flags = 0; diff --git a/util/x86emu/yabel/debug.h b/util/x86emu/yabel/debug.h index 8126262ed9..484a0f7ade 100644 --- a/util/x86emu/yabel/debug.h +++ b/util/x86emu/yabel/debug.h @@ -20,11 +20,7 @@ extern u32 debug_flags; extern void x86emu_dump_xregs(void); /* printf is not available in coreboot... use printk */ -#ifdef CONFIG_COREBOOT_V2 #include <console/console.h> -#else -#include <console.h> -#endif /* uurgs... yuck... x86emu/x86emu.h is redefining printk... we include it here * and use its redefinition of printk * TODO: FIX!!!! */ diff --git a/util/x86emu/yabel/device.c b/util/x86emu/yabel/device.c index d5c114ccb6..6804c66755 100644 --- a/util/x86emu/yabel/device.c +++ b/util/x86emu/yabel/device.c @@ -13,11 +13,7 @@ #include "device.h" -#ifdef CONFIG_COREBOOT_V2 #include "compat/rtas.h" -#else -#include "rtas.h" -#endif #include <string.h> #include "debug.h" @@ -397,11 +393,7 @@ biosemu_dev_init(struct device * device) { u8 rval = 0; //init bios_device struct -#ifdef CONFIG_COREBOOT_V2 DEBUG_PRINTF("%s\n", __func__); -#else - DEBUG_PRINTF("%s(%s)\n", __func__, device->dtsname); -#endif memset(&bios_device, 0, sizeof(bios_device)); #ifndef CONFIG_PCI_OPTION_ROM_RUN_YABEL diff --git a/util/x86emu/yabel/device.h b/util/x86emu/yabel/device.h index b350341947..dbbd28d5e8 100644 --- a/util/x86emu/yabel/device.h +++ b/util/x86emu/yabel/device.h @@ -15,14 +15,8 @@ #define DEVICE_LIB_H #include <types.h> -#ifdef CONFIG_COREBOOT_V2 #include <arch/byteorder.h> #include "compat/of.h" -#else -#include <cpu.h> -#include <byteorder.h> -#include "of.h" -#endif #include "debug.h" diff --git a/util/x86emu/yabel/interrupt.c b/util/x86emu/yabel/interrupt.c index 5542588571..79b0899a08 100644 --- a/util/x86emu/yabel/interrupt.c +++ b/util/x86emu/yabel/interrupt.c @@ -11,11 +11,7 @@ * IBM Corporation - initial implementation *****************************************************************************/ -#ifdef CONFIG_COREBOOT_V2 #include "compat/rtas.h" -#else -#include <rtas.h> -#endif #include "biosemu.h" #include "mem.h" @@ -24,11 +20,7 @@ #include "pmm.h" #include <x86emu/x86emu.h> -#ifdef CONFIG_COREBOOT_V2 #include "../x86emu/prim_ops.h" -#else -#include <x86emu/prim_ops.h> -#endif #ifdef CONFIG_PCI_OPTION_ROM_RUN_YABEL #include <device/pci.h> @@ -350,11 +342,7 @@ handleInt1a(void) __func__, M.x86.R_AX); /* FixME: support SI != 0 */ #if defined(CONFIG_YABEL_PCI_ACCESS_OTHER_DEVICES) && CONFIG_YABEL_PCI_ACCESS_OTHER_DEVICES==1 -#ifdef CONFIG_COREBOOT_V2 dev = dev_find_device(M.x86.R_DX, M.x86.R_CX, 0); -#else - dev = dev_find_pci_device(M.x86.R_DX, M.x86.R_CX, 0); -#endif if (dev != 0) { DEBUG_PRINTF_INTR ("%s(): function %x: PCI Find Device --> 0x%04x\n", diff --git a/util/x86emu/yabel/io.c b/util/x86emu/yabel/io.c index c2e6da818d..fd205e4dd6 100644 --- a/util/x86emu/yabel/io.c +++ b/util/x86emu/yabel/io.c @@ -12,14 +12,8 @@ *****************************************************************************/ #include <types.h> -#ifdef CONFIG_COREBOOT_V2 #include "compat/rtas.h" #include "compat/time.h" -#else -#include <cpu.h> -#include "rtas.h" -#include <time.h> -#endif #include "device.h" #include "debug.h" #include <x86emu/x86emu.h> @@ -36,7 +30,7 @@ extern int write_io(void *, unsigned int, size_t); //defined in net-snk/kernel/timer.c extern u64 get_time(void); -#ifdef COREBOOT_V2 +#ifdef CONFIG_ARCH_X86 #include <arch/io.h> #else // these are not used, only needed for linking, must be overridden using X86emu_setupPioFuncs diff --git a/util/x86emu/yabel/mem.c b/util/x86emu/yabel/mem.c index 91dc3da3f9..339e59f61e 100644 --- a/util/x86emu/yabel/mem.c +++ b/util/x86emu/yabel/mem.c @@ -12,18 +12,11 @@ *****************************************************************************/ #include <types.h> -#ifndef CONFIG_COREBOOT_V2 -#include <cpu.h> -#endif #include "debug.h" #include "device.h" #include "x86emu/x86emu.h" #include "biosemu.h" -#ifdef CONFIG_COREBOOT_V2 #include "compat/time.h" -#else -#include <time.h> -#endif // define a check for access to certain (virtual) memory regions (interrupt handlers, BIOS Data Area, ...) #ifdef CONFIG_DEBUG diff --git a/util/x86emu/yabel/pmm.c b/util/x86emu/yabel/pmm.c index 0b78ca5330..ad4dc6834c 100644 --- a/util/x86emu/yabel/pmm.c +++ b/util/x86emu/yabel/pmm.c @@ -10,11 +10,7 @@ ****************************************************************************/ #include <x86emu/x86emu.h> -#ifdef CONFIG_COREBOOT_V2 #include "../x86emu/prim_ops.h" -#else -#include <x86emu/prim_ops.h> -#endif #include <string.h> #include "biosemu.h" diff --git a/util/x86emu/yabel/vbe.c b/util/x86emu/yabel/vbe.c index a2c9f82655..db60630771 100644 --- a/util/x86emu/yabel/vbe.c +++ b/util/x86emu/yabel/vbe.c @@ -13,19 +13,12 @@ #include <string.h> #include <types.h> -#ifndef CONFIG_COREBOOT_V2 -#include <cpu.h> -#endif #include "debug.h" #include <x86emu/x86emu.h> #include <x86emu/regs.h> -#ifdef CONFIG_COREBOOT_V2 #include "../x86emu/prim_ops.h" -#else -#include <x86emu/prim_ops.h> // for push_word -#endif #include "biosemu.h" #include "io.h" |