mirror of
https://github.com/Fishwaldo/u-boot.git
synced 2025-03-18 13:11:31 +00:00
drivers/bios_emulator: Move conditional compilation to Makefile
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
This commit is contained in:
parent
bcdf1d2cf6
commit
1cb82a9207
11 changed files with 2 additions and 48 deletions
|
@ -6,7 +6,7 @@ X86DIR = x86emu
|
|||
|
||||
$(shell mkdir -p $(obj)$(X86DIR))
|
||||
|
||||
COBJS = atibios.o biosemu.o besys.o bios.o \
|
||||
COBJS-$(CONFIG_BIOSEMU) = atibios.o biosemu.o besys.o bios.o \
|
||||
$(X86DIR)/decode.o \
|
||||
$(X86DIR)/ops2.o \
|
||||
$(X86DIR)/ops.o \
|
||||
|
@ -14,6 +14,7 @@ COBJS = atibios.o biosemu.o besys.o bios.o \
|
|||
$(X86DIR)/sys.o \
|
||||
$(X86DIR)/debug.o
|
||||
|
||||
COBJS := $(COBJS-y)
|
||||
SRCS := $(COBJS:.o=.c)
|
||||
OBJS := $(addprefix $(obj),$(COBJS))
|
||||
|
||||
|
|
|
@ -46,9 +46,6 @@
|
|||
* BIOS in u-boot.
|
||||
****************************************************************************/
|
||||
#include <common.h>
|
||||
|
||||
#ifdef CONFIG_BIOSEMU
|
||||
|
||||
#include "biosemui.h"
|
||||
#include <malloc.h>
|
||||
|
||||
|
@ -336,5 +333,3 @@ int BootVideoCardBIOS(pci_dev_t pcidev, BE_VGAInfo ** pVGAInfo, int cleanUp)
|
|||
*pVGAInfo = VGAInfo;
|
||||
return true;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
|
|
@ -48,9 +48,6 @@
|
|||
****************************************************************************/
|
||||
|
||||
#include <common.h>
|
||||
|
||||
#if defined(CONFIG_BIOSEMU)
|
||||
|
||||
#include "biosemui.h"
|
||||
|
||||
/*------------------------- Global Variables ------------------------------*/
|
||||
|
@ -721,4 +718,3 @@ void X86API BE_outl(X86EMU_pioAddr port, u32 val)
|
|||
#endif
|
||||
LOG_outpd(port, val);
|
||||
}
|
||||
#endif
|
||||
|
|
|
@ -42,9 +42,6 @@
|
|||
****************************************************************************/
|
||||
|
||||
#include <common.h>
|
||||
|
||||
#if defined(CONFIG_BIOSEMU)
|
||||
|
||||
#include "biosemui.h"
|
||||
|
||||
/*----------------------------- Implementation ----------------------------*/
|
||||
|
@ -323,4 +320,3 @@ void _BE_bios_init(u32 * intrTab)
|
|||
bios_intr_tab[0x6D] = int10;
|
||||
X86EMU_setupIntrFuncs(bios_intr_tab);
|
||||
}
|
||||
#endif
|
||||
|
|
|
@ -47,9 +47,6 @@
|
|||
|
||||
#include <malloc.h>
|
||||
#include <common.h>
|
||||
|
||||
#if defined(CONFIG_BIOSEMU)
|
||||
|
||||
#include "biosemui.h"
|
||||
|
||||
BE_sysEnv _BE_env = {{0}};
|
||||
|
@ -372,4 +369,3 @@ int X86API BE_int86x(int intno, RMREGS * in, RMREGS * out, RMSREGS * sregs)
|
|||
sregs->gs = M.x86.R_GS;
|
||||
return out->x.ax;
|
||||
}
|
||||
#endif
|
||||
|
|
|
@ -39,9 +39,6 @@
|
|||
|
||||
#include <stdarg.h>
|
||||
#include <common.h>
|
||||
|
||||
#if defined(CONFIG_BIOSEMU)
|
||||
|
||||
#include "x86emu/x86emui.h"
|
||||
|
||||
/*----------------------------- Implementation ----------------------------*/
|
||||
|
@ -463,5 +460,3 @@ void x86emu_dump_xregs(void)
|
|||
printk("NC ");
|
||||
printk("\n");
|
||||
}
|
||||
|
||||
#endif
|
||||
|
|
|
@ -37,9 +37,6 @@
|
|||
*
|
||||
****************************************************************************/
|
||||
#include <common.h>
|
||||
|
||||
#if defined(CONFIG_BIOSEMU)
|
||||
|
||||
#include "x86emu/x86emui.h"
|
||||
|
||||
/*----------------------------- Implementation ----------------------------*/
|
||||
|
@ -1145,5 +1142,3 @@ unsigned decode_rmXX_address(int mod, int rm)
|
|||
return decode_rm01_address(rm);
|
||||
return decode_rm10_address(rm);
|
||||
}
|
||||
|
||||
#endif
|
||||
|
|
|
@ -76,9 +76,6 @@
|
|||
****************************************************************************/
|
||||
|
||||
#include <common.h>
|
||||
|
||||
#if defined(CONFIG_BIOSEMU)
|
||||
|
||||
#include "x86emu/x86emui.h"
|
||||
|
||||
/*----------------------------- Implementation ----------------------------*/
|
||||
|
@ -5434,5 +5431,3 @@ void (*x86emu_optab[256])(u8) __attribute__ ((section(GOT2_TYPE))) =
|
|||
/* 0xfe */ x86emuOp_opcFE_byte_RM,
|
||||
/* 0xff */ x86emuOp_opcFF_word_RM,
|
||||
};
|
||||
|
||||
#endif
|
||||
|
|
|
@ -45,9 +45,6 @@
|
|||
****************************************************************************/
|
||||
|
||||
#include <common.h>
|
||||
|
||||
#if defined(CONFIG_BIOSEMU)
|
||||
|
||||
#include "x86emu/x86emui.h"
|
||||
|
||||
/*----------------------------- Implementation ----------------------------*/
|
||||
|
@ -1772,5 +1769,3 @@ void (*x86emu_optab2[256])(u8) __attribute__((section(GOT2_TYPE))) =
|
|||
/* 0xfe */ x86emuOp2_illegal_op,
|
||||
/* 0xff */ x86emuOp2_illegal_op,
|
||||
};
|
||||
|
||||
#endif
|
||||
|
|
|
@ -100,9 +100,6 @@
|
|||
#include <common.h>
|
||||
|
||||
#define PRIM_OPS_NO_REDEFINE_ASM
|
||||
|
||||
#if defined(CONFIG_BIOSEMU)
|
||||
|
||||
#include "x86emu/x86emui.h"
|
||||
|
||||
/*------------------------- Global Variables ------------------------------*/
|
||||
|
@ -2448,5 +2445,3 @@ DB( if (CHECK_SP_ACCESS())
|
|||
M.x86.R_SP += 4;
|
||||
return res;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
|
|
@ -40,9 +40,6 @@
|
|||
****************************************************************************/
|
||||
|
||||
#include <common.h>
|
||||
|
||||
#if defined(CONFIG_BIOSEMU)
|
||||
|
||||
#include "x86emu/x86emui.h"
|
||||
|
||||
/*------------------------- Global Variables ------------------------------*/
|
||||
|
@ -324,5 +321,3 @@ void X86EMU_prepareForInt(int num)
|
|||
M.x86.R_IP = mem_access_word(num * 4);
|
||||
M.x86.intr = 0;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
|
Loading…
Add table
Reference in a new issue