diff options
| author | Michal Simek <Monstr@seznam.cz> | 2007-08-16 08:54:10 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2007-08-16 11:55:27 +0200 |
| commit | 002275a3ed8b114885f6702d6d544d0780dfe689 (patch) | |
| tree | dc2622e4db94f68769ef5b4bba07655ac42731bc /drivers/bios_emulator/x86emu | |
| parent | 2d78074d2e806edc380c1464eb9e5df335ece65e (diff) | |
Bios emulator - fix microblaze toolchain problem
microblaze CPU have problem with bios_emulator code.
Microblaze toolchain doesn't support PRAGMA PACK.
Signed-off-by: Michal Simek <monstr@monstr.eu>
Diffstat (limited to 'drivers/bios_emulator/x86emu')
| -rw-r--r-- | drivers/bios_emulator/x86emu/debug.c | 4 | ||||
| -rw-r--r-- | drivers/bios_emulator/x86emu/decode.c | 5 | ||||
| -rw-r--r-- | drivers/bios_emulator/x86emu/ops.c | 4 | ||||
| -rw-r--r-- | drivers/bios_emulator/x86emu/ops2.c | 4 | ||||
| -rw-r--r-- | drivers/bios_emulator/x86emu/prim_ops.c | 5 | ||||
| -rw-r--r-- | drivers/bios_emulator/x86emu/sys.c | 4 |
6 files changed, 19 insertions, 7 deletions
diff --git a/drivers/bios_emulator/x86emu/debug.c b/drivers/bios_emulator/x86emu/debug.c index 915739c5b0..5cbcc95018 100644 --- a/drivers/bios_emulator/x86emu/debug.c +++ b/drivers/bios_emulator/x86emu/debug.c @@ -37,11 +37,13 @@ * ****************************************************************************/ -#include "x86emu/x86emui.h" #include <stdarg.h> +#include <common.h> #if defined(CONFIG_BIOSEMU) +#include "x86emu/x86emui.h" + /*----------------------------- Implementation ----------------------------*/ #ifdef DEBUG diff --git a/drivers/bios_emulator/x86emu/decode.c b/drivers/bios_emulator/x86emu/decode.c index 879f0a06d1..7a9a1ddbff 100644 --- a/drivers/bios_emulator/x86emu/decode.c +++ b/drivers/bios_emulator/x86emu/decode.c @@ -36,11 +36,12 @@ * instruction decoding and accessess of immediate data via IP. etc. * ****************************************************************************/ - -#include "x86emu/x86emui.h" +#include <common.h> #if defined(CONFIG_BIOSEMU) +#include "x86emu/x86emui.h" + /*----------------------------- Implementation ----------------------------*/ /**************************************************************************** diff --git a/drivers/bios_emulator/x86emu/ops.c b/drivers/bios_emulator/x86emu/ops.c index d334fb5b1c..a77bd9b492 100644 --- a/drivers/bios_emulator/x86emu/ops.c +++ b/drivers/bios_emulator/x86emu/ops.c @@ -75,10 +75,12 @@ * ****************************************************************************/ -#include "x86emu/x86emui.h" +#include <common.h> #if defined(CONFIG_BIOSEMU) +#include "x86emu/x86emui.h" + /*----------------------------- Implementation ----------------------------*/ /* constant arrays to do several instructions in just one function */ diff --git a/drivers/bios_emulator/x86emu/ops2.c b/drivers/bios_emulator/x86emu/ops2.c index 81c0d49a33..d6a210c973 100644 --- a/drivers/bios_emulator/x86emu/ops2.c +++ b/drivers/bios_emulator/x86emu/ops2.c @@ -44,10 +44,12 @@ * ****************************************************************************/ -#include "x86emu/x86emui.h" +#include <common.h> #if defined(CONFIG_BIOSEMU) +#include "x86emu/x86emui.h" + /*----------------------------- Implementation ----------------------------*/ /**************************************************************************** diff --git a/drivers/bios_emulator/x86emu/prim_ops.c b/drivers/bios_emulator/x86emu/prim_ops.c index c1152eae34..2a254a4e67 100644 --- a/drivers/bios_emulator/x86emu/prim_ops.c +++ b/drivers/bios_emulator/x86emu/prim_ops.c @@ -97,11 +97,14 @@ * ****************************************************************************/ +#include <common.h> + #define PRIM_OPS_NO_REDEFINE_ASM -#include "x86emu/x86emui.h" #if defined(CONFIG_BIOSEMU) +#include "x86emu/x86emui.h" + /*------------------------- Global Variables ------------------------------*/ static u32 x86emu_parity_tab[8] = diff --git a/drivers/bios_emulator/x86emu/sys.c b/drivers/bios_emulator/x86emu/sys.c index 566389f586..dd44ff1e73 100644 --- a/drivers/bios_emulator/x86emu/sys.c +++ b/drivers/bios_emulator/x86emu/sys.c @@ -39,10 +39,12 @@ * ****************************************************************************/ -#include "x86emu/x86emui.h" +#include <common.h> #if defined(CONFIG_BIOSEMU) +#include "x86emu/x86emui.h" + /*------------------------- Global Variables ------------------------------*/ X86EMU_sysEnv _X86EMU_env; /* Global emulator machine state */ |