erebion/coreboot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Trivial patch to make v3 compile too.

Browse source 
Signed-off-by: Ronald Hoogenboom <hoogenboom30@zonnet.nl>
Acked-by: Stefan Reinauer <stepan@coresystems.de>



git-svn-id: svn://coreboot.org/repository/coreboot-v3@1142 f3766cd6-281f-0410-b1cd-43a5c92072e9
This commit is contained in:
Stefan Reinauer 2009-03-01 19:23:02 +00:00
commit 10c8cd84b2
16 changed files with 25 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

2
util/x86emu/biosemu.c
View file

@ -36,7 +36,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
#if COREBOOT_V2
#ifdef COREBOOT_V2
#include <arch/io.h>
#include <console/console.h>
#else

4
util/x86emu/pcbios/pcibios.c
View file

@ -35,7 +35,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
#if COREBOOT_V2
#ifdef COREBOOT_V2
#include <console/console.h>
#else
#include <console.h>
@ -65,7 +65,7 @@ int pcibios_handler(void)
break;
case FIND_PCI_DEVICE:
/* FixME: support SI != 0 */
#if COREBOOT_V2
#ifdef COREBOOT_V2
dev = dev_find_device(X86_DX, X86_CX, dev);
#else
dev = dev_find_pci_device(X86_DX, X86_CX, dev);

4
util/x86emu/vm86.c
View file

@ -26,7 +26,7 @@
#include <device/pci_ids.h>
#include <device/pci_ops.h>
#include <string.h>
#if COREBOOT_V2
#ifdef COREBOOT_V2
#include <console/console.h>
#include <arch/io.h>
#define printk(lvl, x...) printk_debug(x)
@ -591,7 +591,7 @@ pcibios(unsigned long *pedi, unsigned long *pesi, unsigned long *pebp,
vendorid = *pedx;
devindex = *pesi;
dev = 0;
#if COREBOOT_V2
#ifdef COREBOOT_V2
while ((dev = dev_find_device(vendorid, devid, dev))) {
#else
while ((dev = dev_find_pci_device(vendorid, devid, dev))) {

4
util/x86emu/vm86_gdt.c
View file

@ -33,7 +33,7 @@ __asm__ (
" .globl gdtarg\n"
"gdtarg: \n"
" .word gdt_limit \n"
#if COREBOOT_V2
#ifdef COREBOOT_V2
" .long gdt \n"
#else
" .long gdtptr \n"
@ -78,7 +78,7 @@ __asm__ (
"__mygdt_end: \n"
#if !COREBOOT_V2
#ifndef COREBOOT_V2
/* FIXME: This does probably not belong here */
" .globl idtarg\n"
"idtarg:\n"

2
util/x86emu/x86emu/sys.c
View file

@ -46,7 +46,7 @@
#include "debug.h"
#include "prim_ops.h"
#if 1 /* Coreboot needs to map prinkf to printk. */
#if COREBOOT_V2
#ifdef COREBOOT_V2
#include "arch/io.h"
#else
#include "io.h"

6
util/x86emu/yabel/biosemu.c
View file

@ -13,7 +13,7 @@
#include <string.h>
#include <types.h>
#if !COREBOOT_V2
#ifndef COREBOOT_V2
#include <cpu.h>
#endif
@ -21,7 +21,7 @@
#include <x86emu/x86emu.h>
#include <x86emu/regs.h>
#if COREBOOT_V2
#ifdef COREBOOT_V2
#include "../x86emu/prim_ops.h"
#else
#include <x86emu/prim_ops.h> // for push_word
@ -34,7 +34,7 @@
#include "device.h"
#include "pmm.h"
#if COREBOOT_V2
#ifdef COREBOOT_V2
#include "compat/rtas.h"
#else
#include <rtas.h>

2
util/x86emu/yabel/compat/functions.c
View file

@ -14,7 +14,7 @@
*/
#include <types.h>
#if !COREBOOT_V2
#ifndef COREBOOT_V2
#include <config.h>
#endif
#include <device/device.h>

2
util/x86emu/yabel/debug.c
View file

@ -10,7 +10,7 @@
* IBM Corporation - initial implementation
*****************************************************************************/
#if !COREBOOT_V2
#ifndef COREBOOT_V2
#include <cpu.h>
#endif

2
util/x86emu/yabel/debug.h
View file

@ -19,7 +19,7 @@ extern u32 debug_flags;
extern void x86emu_dump_xregs(void);
/* printf is not available in coreboot... use printk */
#if COREBOOT_V2
#ifdef COREBOOT_V2
#include <console/console.h>
#else
#include <console.h>

4
util/x86emu/yabel/device.c
View file

@ -12,7 +12,7 @@
#include "device.h"
#if COREBOOT_V2
#ifdef COREBOOT_V2
#include "compat/rtas.h"
#else
#include "rtas.h"
@ -396,7 +396,7 @@ biosemu_dev_init(struct device * device)
{
u8 rval = 0;
//init bios_device struct
#if COREBOOT_V2
#ifdef COREBOOT_V2
DEBUG_PRINTF("%s\n", __func__);
#else
DEBUG_PRINTF("%s(%s)\n", __func__, device->dtsname);

2
util/x86emu/yabel/device.h
View file

@ -14,7 +14,7 @@
#define DEVICE_LIB_H
#include <types.h>
#if COREBOOT_V2
#ifdef COREBOOT_V2
#include <arch/byteorder.h>
#include "compat/of.h"
#else

4
util/x86emu/yabel/interrupt.c
View file

@ -10,7 +10,7 @@
* IBM Corporation - initial implementation
*****************************************************************************/
#if COREBOOT_V2
#ifdef COREBOOT_V2
#include "compat/rtas.h"
#else
#include <rtas.h>
@ -23,7 +23,7 @@
#include "pmm.h"
#include <x86emu/x86emu.h>
#if COREBOOT_V2
#ifdef COREBOOT_V2
#include "../x86emu/prim_ops.h"
#else
#include <x86emu/prim_ops.h>

2
util/x86emu/yabel/io.c
View file

@ -11,7 +11,7 @@
*****************************************************************************/
#include <types.h>
#if COREBOOT_V2
#ifdef COREBOOT_V2
#include "compat/rtas.h"
#include "compat/time.h"
#else

4
util/x86emu/yabel/mem.c
View file

@ -11,14 +11,14 @@
*****************************************************************************/
#include <types.h>
#if !COREBOOT_V2
#ifndef COREBOOT_V2
#include <cpu.h>
#endif
#include "debug.h"
#include "device.h"
#include "x86emu/x86emu.h"
#include "biosemu.h"
#if COREBOOT_V2
#ifdef COREBOOT_V2
#include "compat/time.h"
#else
#include <time.h>

2
util/x86emu/yabel/pmm.c
View file

@ -10,7 +10,7 @@
****************************************************************************/
#include <x86emu/x86emu.h>
#if COREBOOT_V2
#ifdef COREBOOT_V2
#include "../x86emu/prim_ops.h"
#else
#include <x86emu/prim_ops.h>

4
util/x86emu/yabel/vbe.c
View file

@ -12,7 +12,7 @@
#include <string.h>
#include <types.h>
#if !COREBOOT_V2
#ifndef COREBOOT_V2
#include <cpu.h>
#endif
@ -20,7 +20,7 @@
#include <x86emu/x86emu.h>
#include <x86emu/regs.h>
#if COREBOOT_V2
#ifdef COREBOOT_V2
#include "../x86emu/prim_ops.h"
#else
#include <x86emu/prim_ops.h> // for push_word