GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
This commit is contained in:
Stefan Reinauer 2010-01-19 21:13:44 +00:00 committed by Stefan Reinauer
parent d5663bac2c
commit 8ed1b6d2dc
20 changed files with 2 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -3,6 +3,7 @@
## ##
## Copyright (C) 2008 Advanced Micro Devices, Inc. ## Copyright (C) 2008 Advanced Micro Devices, Inc.
## Copyright (C) 2008 Uwe Hermann <uwe@hermann-uwe.de> ## Copyright (C) 2008 Uwe Hermann <uwe@hermann-uwe.de>
## Copyright (C) 2009-2010 coresystems GmbH
## ##
## Redistribution and use in source and binary forms, with or without ## Redistribution and use in source and binary forms, with or without
## modification, are permitted provided that the following conditions ## modification, are permitted provided that the following conditions
@ -44,7 +45,6 @@ export config_g := $(sconfig)/config.g
export KERNELVERSION := 2.3 export KERNELVERSION := 2.3
export KCONFIG_AUTOHEADER := $(obj)/config.h export KCONFIG_AUTOHEADER := $(obj)/config.h
export KCONFIG_AUTOCONFIG := $(obj)/auto.conf export KCONFIG_AUTOCONFIG := $(obj)/auto.conf
export COREBOOT_V2 := 1
CONFIG_SHELL := sh CONFIG_SHELL := sh
KBUILD_DEFCONFIG := configs/defconfig KBUILD_DEFCONFIG := configs/defconfig
@ -271,7 +271,6 @@ prepare2:
@printf " GEN build.h\n" @printf " GEN build.h\n"
printf "#define COREBOOT_VERSION \"$(KERNELVERSION)\"\n" > $(obj)/build.h printf "#define COREBOOT_VERSION \"$(KERNELVERSION)\"\n" > $(obj)/build.h
printf "#define COREBOOT_EXTRA_VERSION \"$(COREBOOT_EXTRA_VERSION)\"\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 "#define COREBOOT_BUILD \"`LANG= date`\"\n" >> $(obj)/build.h
printf "\n" >> $(obj)/build.h printf "\n" >> $(obj)/build.h
printf "#define COREBOOT_COMPILER \"$(shell LANG= $(CC) --version | head -n1)\"\n" >> $(obj)/build.h printf "#define COREBOOT_COMPILER \"$(shell LANG= $(CC) --version | head -n1)\"\n" >> $(obj)/build.h

8
src/Kconfig
View File

@ -115,14 +115,6 @@ config HEAP_SIZE
hex hex
default 0x4000 default 0x4000
config COREBOOT_V2
bool
default y
config COREBOOT_V4
bool
default y
config DEBUG config DEBUG
bool bool
default n default n

6
src/config/Options.lb
View File

@ -176,12 +176,6 @@ define CONFIG_USE_INIT
comment "Use stage 1 initialization code" comment "Use stage 1 initialization code"
end end
define CONFIG_COREBOOT_V2
default 1
export always
comment "This is used by code to determine v2 vs v3"
end
############################################### ###############################################
# ROM image options # ROM image options
############################################### ###############################################

1
util/compareboard/compareboard
View File

@ -89,7 +89,6 @@ sed \
-e "/^CONFIG_SUPERIO_/ d" \ -e "/^CONFIG_SUPERIO_/ d" \
-e "/^CONFIG_GX1_VIDEOMODE_/ d" \ -e "/^CONFIG_GX1_VIDEOMODE_/ d" \
-e "/^CONFIG_CONSOLE_/ d" \ -e "/^CONFIG_CONSOLE_/ d" \
-e "/^CONFIG_COREBOOT_V4/ d" \
-e "/^CONFIG_PAYLOAD_/ d" \ -e "/^CONFIG_PAYLOAD_/ d" \
-e "/^CONFIG_XIP_ROM_/ d" \ -e "/^CONFIG_XIP_ROM_/ d" \
-e "/^CONFIG_MULTIBOOT/ d" \ -e "/^CONFIG_MULTIBOOT/ d" \

9
util/x86emu/biosemu.c
View File

@ -37,13 +37,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include <string.h> #include <string.h>
#ifdef CONFIG_COREBOOT_V2
#include <arch/io.h> #include <arch/io.h>
#include <console/console.h> #include <console/console.h>
#else
#include <io.h>
#include <console.h>
#endif
#include <device/device.h> #include <device/device.h>
#include <device/pci.h> #include <device/pci.h>
#include <device/pci_ids.h> #include <device/pci_ids.h>
@ -243,11 +238,7 @@ static int int1a_handler(void)
break; break;
case FIND_PCI_DEVICE: case FIND_PCI_DEVICE:
/* FIXME: support SI != 0 */ /* FIXME: support SI != 0 */
#ifdef CONFIG_COREBOOT_V2
dev = dev_find_device(X86_DX, X86_CX, dev); dev = dev_find_device(X86_DX, X86_CX, dev);
#else
dev = dev_find_pci_device(X86_DX, X86_CX, dev);
#endif
if (dev != 0) { if (dev != 0) {
X86_BH = dev->bus->secondary; X86_BH = dev->bus->secondary;
X86_BL = dev->path.pci.devfn; X86_BL = dev->path.pci.devfn;

4
util/x86emu/include/x86emu/x86emu.h
View File

@ -43,7 +43,6 @@
#define __X86EMU_X86EMU_H #define __X86EMU_X86EMU_H
/* FIXME: redefine printk for the moment */ /* FIXME: redefine printk for the moment */
#ifdef CONFIG_COREBOOT_V2
#include <stddef.h> #include <stddef.h>
#include <console/console.h> #include <console/console.h>
#undef printk #undef printk
@ -51,9 +50,6 @@
#if defined(CONFIG_DEBUG) && (CONFIG_DEBUG == 0) #if defined(CONFIG_DEBUG) && (CONFIG_DEBUG == 0)
#undef CONFIG_DEBUG #undef CONFIG_DEBUG
#endif #endif
#else
#define printk printf
#endif
#ifdef SCITECH #ifdef SCITECH
#include "scitech.h" #include "scitech.h"

4
util/x86emu/x86.c
View File

@ -20,14 +20,10 @@
#include <device/pci.h> #include <device/pci.h>
#include <string.h> #include <string.h>
#ifdef CONFIG_COREBOOT_V2
#include <arch/io.h> #include <arch/io.h>
#include <arch/registers.h> #include <arch/registers.h>
#include <console/console.h> #include <console/console.h>
#define printk(x...) do_printk(x) #define printk(x...) do_printk(x)
#else
#include <console.h>
#endif
#include <arch/interrupt.h> #include <arch/interrupt.h>

9
util/x86emu/x86_interrupts.c
View File

@ -23,15 +23,10 @@
#include <device/pci_ids.h> #include <device/pci_ids.h>
#include <device/pci_ops.h> #include <device/pci_ops.h>
#include <string.h> #include <string.h>
#ifdef CONFIG_COREBOOT_V2
#include <console/console.h> #include <console/console.h>
#include <arch/io.h> #include <arch/io.h>
#include <arch/registers.h> #include <arch/registers.h>
#define printk(x...) do_printk(x) #define printk(x...) do_printk(x)
#else
#include <console.h>
#include <io.h>
#endif
enum { enum {
PCIBIOS_CHECK = 0xb101, PCIBIOS_CHECK = 0xb101,
@ -88,11 +83,7 @@ int int1a_handler(struct eregs *regs)
vendorid = regs->edx; vendorid = regs->edx;
devindex = regs->esi; devindex = regs->esi;
dev = 0; dev = 0;
#ifdef CONFIG_COREBOOT_V2
while ((dev = dev_find_device(vendorid, devid, dev))) { while ((dev = dev_find_device(vendorid, devid, dev))) {
#else
while ((dev = dev_find_pci_device(vendorid, devid, dev))) {
#endif
if (devindex <= 0) if (devindex <= 0)
break; break;
devindex--; devindex--;

4
util/x86emu/x86emu/sys.c
View File

@ -46,12 +46,8 @@
#include "debug.h" #include "debug.h"
#include "prim_ops.h" #include "prim_ops.h"
#if 1 /* Coreboot needs to map prinkf to printk. */ #if 1 /* Coreboot needs to map prinkf to printk. */
#ifdef CONFIG_COREBOOT_V2
#include "arch/io.h" #include "arch/io.h"
#else #else
#include "io.h"
#endif
#else
#include <sys/io.h> #include <sys/io.h>
#endif #endif

11
util/x86emu/yabel/biosemu.c
View File

@ -14,19 +14,12 @@
#include <string.h> #include <string.h>
#include <types.h> #include <types.h>
#ifndef CONFIG_COREBOOT_V2
#include <cpu.h>
#endif
#include "debug.h" #include "debug.h"
#include <x86emu/x86emu.h> #include <x86emu/x86emu.h>
#include <x86emu/regs.h> #include <x86emu/regs.h>
#ifdef CONFIG_COREBOOT_V2
#include "../x86emu/prim_ops.h" #include "../x86emu/prim_ops.h"
#else
#include <x86emu/prim_ops.h> // for push_word
#endif
#include "biosemu.h" #include "biosemu.h"
#include "io.h" #include "io.h"
@ -35,11 +28,7 @@
#include "device.h" #include "device.h"
#include "pmm.h" #include "pmm.h"
#ifdef CONFIG_COREBOOT_V2
#include "compat/rtas.h" #include "compat/rtas.h"
#else
#include <rtas.h>
#endif
#include <device/device.h> #include <device/device.h>

3
util/x86emu/yabel/compat/functions.c
View File

@ -14,9 +14,6 @@
*/ */
#include <types.h> #include <types.h>
#ifndef CONFIG_COREBOOT_V2
#include <config.h>
#endif
#include <string.h> #include <string.h>
#include <device/device.h> #include <device/device.h>

4
util/x86emu/yabel/debug.c
View File

@ -11,10 +11,6 @@
* IBM Corporation - initial implementation * IBM Corporation - initial implementation
*****************************************************************************/ *****************************************************************************/
#ifndef CONFIG_COREBOOT_V2
#include <cpu.h>
#endif
#include "debug.h" #include "debug.h"
u32 debug_flags = 0; u32 debug_flags = 0;

4
util/x86emu/yabel/debug.h
View File

@ -20,11 +20,7 @@ extern u32 debug_flags;
extern void x86emu_dump_xregs(void); extern void x86emu_dump_xregs(void);
/* printf is not available in coreboot... use printk */ /* printf is not available in coreboot... use printk */
#ifdef CONFIG_COREBOOT_V2
#include <console/console.h> #include <console/console.h>
#else
#include <console.h>
#endif
/* uurgs... yuck... x86emu/x86emu.h is redefining printk... we include it here /* uurgs... yuck... x86emu/x86emu.h is redefining printk... we include it here
* and use its redefinition of printk * and use its redefinition of printk
* TODO: FIX!!!! */ * TODO: FIX!!!! */

8
util/x86emu/yabel/device.c
View File

@ -13,11 +13,7 @@
#include "device.h" #include "device.h"
#ifdef CONFIG_COREBOOT_V2
#include "compat/rtas.h" #include "compat/rtas.h"
#else
#include "rtas.h"
#endif
#include <string.h> #include <string.h>
#include "debug.h" #include "debug.h"
@ -397,11 +393,7 @@ biosemu_dev_init(struct device * device)
{ {
u8 rval = 0; u8 rval = 0;
//init bios_device struct //init bios_device struct
#ifdef CONFIG_COREBOOT_V2
DEBUG_PRINTF("%s\n", __func__); DEBUG_PRINTF("%s\n", __func__);
#else
DEBUG_PRINTF("%s(%s)\n", __func__, device->dtsname);
#endif
memset(&bios_device, 0, sizeof(bios_device)); memset(&bios_device, 0, sizeof(bios_device));
#ifndef CONFIG_PCI_OPTION_ROM_RUN_YABEL #ifndef CONFIG_PCI_OPTION_ROM_RUN_YABEL

6
util/x86emu/yabel/device.h
View File

@ -15,14 +15,8 @@
#define DEVICE_LIB_H #define DEVICE_LIB_H
#include <types.h> #include <types.h>
#ifdef CONFIG_COREBOOT_V2
#include <arch/byteorder.h> #include <arch/byteorder.h>
#include "compat/of.h" #include "compat/of.h"
#else
#include <cpu.h>
#include <byteorder.h>
#include "of.h"
#endif
#include "debug.h" #include "debug.h"

12
util/x86emu/yabel/interrupt.c
View File

@ -11,11 +11,7 @@
* IBM Corporation - initial implementation * IBM Corporation - initial implementation
*****************************************************************************/ *****************************************************************************/
#ifdef CONFIG_COREBOOT_V2
#include "compat/rtas.h" #include "compat/rtas.h"
#else
#include <rtas.h>
#endif
#include "biosemu.h" #include "biosemu.h"
#include "mem.h" #include "mem.h"
@ -24,11 +20,7 @@
#include "pmm.h" #include "pmm.h"
#include <x86emu/x86emu.h> #include <x86emu/x86emu.h>
#ifdef CONFIG_COREBOOT_V2
#include "../x86emu/prim_ops.h" #include "../x86emu/prim_ops.h"
#else
#include <x86emu/prim_ops.h>
#endif
#ifdef CONFIG_PCI_OPTION_ROM_RUN_YABEL #ifdef CONFIG_PCI_OPTION_ROM_RUN_YABEL
#include <device/pci.h> #include <device/pci.h>
@ -350,11 +342,7 @@ handleInt1a(void)
__func__, M.x86.R_AX); __func__, M.x86.R_AX);
/* FixME: support SI != 0 */ /* FixME: support SI != 0 */
#if defined(CONFIG_YABEL_PCI_ACCESS_OTHER_DEVICES) && CONFIG_YABEL_PCI_ACCESS_OTHER_DEVICES==1 #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); 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) { if (dev != 0) {
DEBUG_PRINTF_INTR DEBUG_PRINTF_INTR
("%s(): function %x: PCI Find Device --> 0x%04x\n", ("%s(): function %x: PCI Find Device --> 0x%04x\n",

8
util/x86emu/yabel/io.c
View File

@ -12,14 +12,8 @@
*****************************************************************************/ *****************************************************************************/
#include <types.h> #include <types.h>
#ifdef CONFIG_COREBOOT_V2
#include "compat/rtas.h" #include "compat/rtas.h"
#include "compat/time.h" #include "compat/time.h"
#else
#include <cpu.h>
#include "rtas.h"
#include <time.h>
#endif
#include "device.h" #include "device.h"
#include "debug.h" #include "debug.h"
#include <x86emu/x86emu.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 //defined in net-snk/kernel/timer.c
extern u64 get_time(void); extern u64 get_time(void);
#ifdef COREBOOT_V2 #ifdef CONFIG_ARCH_X86
#include <arch/io.h> #include <arch/io.h>
#else #else
// these are not used, only needed for linking, must be overridden using X86emu_setupPioFuncs // these are not used, only needed for linking, must be overridden using X86emu_setupPioFuncs

7
util/x86emu/yabel/mem.c
View File

@ -12,18 +12,11 @@
*****************************************************************************/ *****************************************************************************/
#include <types.h> #include <types.h>
#ifndef CONFIG_COREBOOT_V2
#include <cpu.h>
#endif
#include "debug.h" #include "debug.h"
#include "device.h" #include "device.h"
#include "x86emu/x86emu.h" #include "x86emu/x86emu.h"
#include "biosemu.h" #include "biosemu.h"
#ifdef CONFIG_COREBOOT_V2
#include "compat/time.h" #include "compat/time.h"
#else
#include <time.h>
#endif
// define a check for access to certain (virtual) memory regions (interrupt handlers, BIOS Data Area, ...) // define a check for access to certain (virtual) memory regions (interrupt handlers, BIOS Data Area, ...)
#ifdef CONFIG_DEBUG #ifdef CONFIG_DEBUG

4
util/x86emu/yabel/pmm.c
View File

@ -10,11 +10,7 @@
****************************************************************************/ ****************************************************************************/
#include <x86emu/x86emu.h> #include <x86emu/x86emu.h>
#ifdef CONFIG_COREBOOT_V2
#include "../x86emu/prim_ops.h" #include "../x86emu/prim_ops.h"
#else
#include <x86emu/prim_ops.h>
#endif
#include <string.h> #include <string.h>
#include "biosemu.h" #include "biosemu.h"

7
util/x86emu/yabel/vbe.c
View File

@ -13,19 +13,12 @@
#include <string.h> #include <string.h>
#include <types.h> #include <types.h>
#ifndef CONFIG_COREBOOT_V2
#include <cpu.h>
#endif
#include "debug.h" #include "debug.h"
#include <x86emu/x86emu.h> #include <x86emu/x86emu.h>
#include <x86emu/regs.h> #include <x86emu/regs.h>
#ifdef CONFIG_COREBOOT_V2
#include "../x86emu/prim_ops.h" #include "../x86emu/prim_ops.h"
#else
#include <x86emu/prim_ops.h> // for push_word
#endif
#include "biosemu.h" #include "biosemu.h"
#include "io.h" #include "io.h"