From 8ed1b6d2dc16b25334dff13033843b8c7f125f83 Mon Sep 17 00:00:00 2001 From: Stefan Reinauer Date: Tue, 19 Jan 2010 21:13:44 +0000 Subject: 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 Acked-by: Peter Stuge git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5040 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- Makefile | 3 +-- src/Kconfig | 8 -------- src/config/Options.lb | 6 ------ util/compareboard/compareboard | 1 - util/x86emu/biosemu.c | 9 --------- util/x86emu/include/x86emu/x86emu.h | 4 ---- util/x86emu/x86.c | 4 ---- util/x86emu/x86_interrupts.c | 9 --------- util/x86emu/x86emu/sys.c | 4 ---- util/x86emu/yabel/biosemu.c | 11 ----------- util/x86emu/yabel/compat/functions.c | 3 --- util/x86emu/yabel/debug.c | 4 ---- util/x86emu/yabel/debug.h | 4 ---- util/x86emu/yabel/device.c | 8 -------- util/x86emu/yabel/device.h | 6 ------ util/x86emu/yabel/interrupt.c | 12 ------------ util/x86emu/yabel/io.c | 8 +------- util/x86emu/yabel/mem.c | 7 ------- util/x86emu/yabel/pmm.c | 4 ---- util/x86emu/yabel/vbe.c | 7 ------- 20 files changed, 2 insertions(+), 120 deletions(-) diff --git a/Makefile b/Makefile index 302ac9de9c..c7a838146a 100644 --- a/Makefile +++ b/Makefile @@ -3,6 +3,7 @@ ## ## Copyright (C) 2008 Advanced Micro Devices, Inc. ## Copyright (C) 2008 Uwe Hermann +## Copyright (C) 2009-2010 coresystems GmbH ## ## Redistribution and use in source and binary forms, with or without ## modification, are permitted provided that the following conditions @@ -44,7 +45,6 @@ export config_g := $(sconfig)/config.g export KERNELVERSION := 2.3 export KCONFIG_AUTOHEADER := $(obj)/config.h export KCONFIG_AUTOCONFIG := $(obj)/auto.conf -export COREBOOT_V2 := 1 CONFIG_SHELL := sh KBUILD_DEFCONFIG := configs/defconfig @@ -271,7 +271,6 @@ prepare2: @printf " GEN build.h\n" printf "#define COREBOOT_VERSION \"$(KERNELVERSION)\"\n" > $(obj)/build.h printf "#define COREBOOT_EXTRA_VERSION \"$(COREBOOT_EXTRA_VERSION)\"\n" >> $(obj)/build.h - printf "#define COREBOOT_V2 \"$(COREBOOT_V2)\"\n" >> $(obj)/build.h printf "#define COREBOOT_BUILD \"`LANG= date`\"\n" >> $(obj)/build.h printf "\n" >> $(obj)/build.h printf "#define COREBOOT_COMPILER \"$(shell LANG= $(CC) --version | head -n1)\"\n" >> $(obj)/build.h diff --git a/src/Kconfig b/src/Kconfig index 20a1a13f6b..a7d9cfb49a 100644 --- a/src/Kconfig +++ b/src/Kconfig @@ -115,14 +115,6 @@ config HEAP_SIZE hex default 0x4000 -config COREBOOT_V2 - bool - default y - -config COREBOOT_V4 - bool - default y - config DEBUG bool default n diff --git a/src/config/Options.lb b/src/config/Options.lb index 613111a3a2..9af3daf93d 100644 --- a/src/config/Options.lb +++ b/src/config/Options.lb @@ -176,12 +176,6 @@ define CONFIG_USE_INIT comment "Use stage 1 initialization code" end -define CONFIG_COREBOOT_V2 - default 1 - export always - comment "This is used by code to determine v2 vs v3" -end - ############################################### # ROM image options ############################################### diff --git a/util/compareboard/compareboard b/util/compareboard/compareboard index 8ccbca19d1..4b92fb8fe6 100755 --- a/util/compareboard/compareboard +++ b/util/compareboard/compareboard @@ -89,7 +89,6 @@ sed \ -e "/^CONFIG_SUPERIO_/ d" \ -e "/^CONFIG_GX1_VIDEOMODE_/ d" \ -e "/^CONFIG_CONSOLE_/ d" \ - -e "/^CONFIG_COREBOOT_V4/ d" \ -e "/^CONFIG_PAYLOAD_/ d" \ -e "/^CONFIG_XIP_ROM_/ d" \ -e "/^CONFIG_MULTIBOOT/ d" \ diff --git a/util/x86emu/biosemu.c b/util/x86emu/biosemu.c index c773539c3e..b847bb0109 100644 --- a/util/x86emu/biosemu.c +++ b/util/x86emu/biosemu.c @@ -37,13 +37,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #include -#ifdef CONFIG_COREBOOT_V2 #include #include -#else -#include -#include -#endif #include #include #include @@ -243,11 +238,7 @@ static int int1a_handler(void) break; case FIND_PCI_DEVICE: /* FIXME: support SI != 0 */ -#ifdef CONFIG_COREBOOT_V2 dev = dev_find_device(X86_DX, X86_CX, dev); -#else - dev = dev_find_pci_device(X86_DX, X86_CX, dev); -#endif if (dev != 0) { X86_BH = dev->bus->secondary; X86_BL = dev->path.pci.devfn; diff --git a/util/x86emu/include/x86emu/x86emu.h b/util/x86emu/include/x86emu/x86emu.h index 04381627c7..60acfe763c 100644 --- a/util/x86emu/include/x86emu/x86emu.h +++ b/util/x86emu/include/x86emu/x86emu.h @@ -43,7 +43,6 @@ #define __X86EMU_X86EMU_H /* FIXME: redefine printk for the moment */ -#ifdef CONFIG_COREBOOT_V2 #include #include #undef printk @@ -51,9 +50,6 @@ #if defined(CONFIG_DEBUG) && (CONFIG_DEBUG == 0) #undef CONFIG_DEBUG #endif -#else -#define printk printf -#endif #ifdef SCITECH #include "scitech.h" diff --git a/util/x86emu/x86.c b/util/x86emu/x86.c index 342bb6ef77..5644648b84 100644 --- a/util/x86emu/x86.c +++ b/util/x86emu/x86.c @@ -20,14 +20,10 @@ #include #include -#ifdef CONFIG_COREBOOT_V2 #include #include #include #define printk(x...) do_printk(x) -#else -#include -#endif #include diff --git a/util/x86emu/x86_interrupts.c b/util/x86emu/x86_interrupts.c index a792fdff1b..a21a0ab988 100644 --- a/util/x86emu/x86_interrupts.c +++ b/util/x86emu/x86_interrupts.c @@ -23,15 +23,10 @@ #include #include #include -#ifdef CONFIG_COREBOOT_V2 #include #include #include #define printk(x...) do_printk(x) -#else -#include -#include -#endif enum { PCIBIOS_CHECK = 0xb101, @@ -88,11 +83,7 @@ int int1a_handler(struct eregs *regs) vendorid = regs->edx; devindex = regs->esi; dev = 0; -#ifdef CONFIG_COREBOOT_V2 while ((dev = dev_find_device(vendorid, devid, dev))) { -#else - while ((dev = dev_find_pci_device(vendorid, devid, dev))) { -#endif if (devindex <= 0) break; devindex--; diff --git a/util/x86emu/x86emu/sys.c b/util/x86emu/x86emu/sys.c index ffdfe90da9..b4bed43ba4 100644 --- a/util/x86emu/x86emu/sys.c +++ b/util/x86emu/x86emu/sys.c @@ -46,12 +46,8 @@ #include "debug.h" #include "prim_ops.h" #if 1 /* Coreboot needs to map prinkf to printk. */ -#ifdef CONFIG_COREBOOT_V2 #include "arch/io.h" #else -#include "io.h" -#endif -#else #include #endif 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 #include -#ifndef CONFIG_COREBOOT_V2 -#include -#endif #include "debug.h" #include #include -#ifdef CONFIG_COREBOOT_V2 #include "../x86emu/prim_ops.h" -#else -#include // 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 -#endif #include 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 -#ifndef CONFIG_COREBOOT_V2 -#include -#endif #include #include 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 -#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 -#else -#include -#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 #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 -#ifdef CONFIG_COREBOOT_V2 #include #include "compat/of.h" -#else -#include -#include -#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 -#endif #include "biosemu.h" #include "mem.h" @@ -24,11 +20,7 @@ #include "pmm.h" #include -#ifdef CONFIG_COREBOOT_V2 #include "../x86emu/prim_ops.h" -#else -#include -#endif #ifdef CONFIG_PCI_OPTION_ROM_RUN_YABEL #include @@ -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 -#ifdef CONFIG_COREBOOT_V2 #include "compat/rtas.h" #include "compat/time.h" -#else -#include -#include "rtas.h" -#include -#endif #include "device.h" #include "debug.h" #include @@ -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 #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 -#ifndef CONFIG_COREBOOT_V2 -#include -#endif #include "debug.h" #include "device.h" #include "x86emu/x86emu.h" #include "biosemu.h" -#ifdef CONFIG_COREBOOT_V2 #include "compat/time.h" -#else -#include -#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 -#ifdef CONFIG_COREBOOT_V2 #include "../x86emu/prim_ops.h" -#else -#include -#endif #include #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 #include -#ifndef CONFIG_COREBOOT_V2 -#include -#endif #include "debug.h" #include #include -#ifdef CONFIG_COREBOOT_V2 #include "../x86emu/prim_ops.h" -#else -#include // for push_word -#endif #include "biosemu.h" #include "io.h" -- cgit v1.2.3