* [U-Boot-Users] [PATCH] Add CONFIG_BIOSEMU define to guard all the bios emulator code
@ 2007-08-07 8:17 Jason Jin
2007-08-07 8:17 ` [U-Boot-Users] [PATCH] Minor fix for bios emulator makefile Jason Jin
` (2 more replies)
0 siblings, 3 replies; 10+ messages in thread
From: Jason Jin @ 2007-08-07 8:17 UTC (permalink / raw)
To: u-boot
This patch fix the compile issue on the board that did not enable the bios emulator
---
drivers/bios_emulator/besys.c | 2 ++
drivers/bios_emulator/bios.c | 2 ++
drivers/bios_emulator/biosemu.c | 3 +++
drivers/bios_emulator/x86emu/debug.c | 4 ++++
drivers/bios_emulator/x86emu/decode.c | 4 ++++
drivers/bios_emulator/x86emu/ops.c | 5 +++++
drivers/bios_emulator/x86emu/ops2.c | 4 ++++
drivers/bios_emulator/x86emu/prim_ops.c | 4 ++++
drivers/bios_emulator/x86emu/sys.c | 4 ++++
9 files changed, 32 insertions(+), 0 deletions(-)
diff --git a/drivers/bios_emulator/besys.c b/drivers/bios_emulator/besys.c
index 2a8e1a0..4c4bc8d 100644
--- a/drivers/bios_emulator/besys.c
+++ b/drivers/bios_emulator/besys.c
@@ -49,6 +49,7 @@
#include "biosemui.h"
+#if defined(CONFIG_BIOSEMU)
/*------------------------- Global Variables ------------------------------*/
#ifndef __i386__
@@ -717,3 +718,4 @@ void X86API BE_outl(X86EMU_pioAddr port, u32 val)
#endif
LOG_outpd(port, val);
}
+#endif
diff --git a/drivers/bios_emulator/bios.c b/drivers/bios_emulator/bios.c
index ed5437e..7aa1bfb 100644
--- a/drivers/bios_emulator/bios.c
+++ b/drivers/bios_emulator/bios.c
@@ -43,6 +43,7 @@
#include "biosemui.h"
+#if defined(CONFIG_BIOSEMU)
/*----------------------------- Implementation ----------------------------*/
/****************************************************************************
@@ -319,3 +320,4 @@ void _BE_bios_init(u32 * intrTab)
bios_intr_tab[0x6D] = int10;
X86EMU_setupIntrFuncs(bios_intr_tab);
}
+#endif
diff --git a/drivers/bios_emulator/biosemu.c b/drivers/bios_emulator/biosemu.c
index 06d4ad3..4c3aedf 100644
--- a/drivers/bios_emulator/biosemu.c
+++ b/drivers/bios_emulator/biosemu.c
@@ -48,6 +48,8 @@
#include "biosemui.h"
#include <malloc.h>
+#if defined(CONFIG_BIOSEMU)
+
BE_sysEnv _BE_env = {{0}};
static X86EMU_memFuncs _BE_mem __attribute__((section(".got2"))) = {
BE_rdb,
@@ -368,3 +370,4 @@ int X86API BE_int86x(int intno, RMREGS * in, RMREGS * out, RMSREGS * sregs)
sregs->gs = M.x86.R_GS;
return out->x.ax;
}
+#endif
diff --git a/drivers/bios_emulator/x86emu/debug.c b/drivers/bios_emulator/x86emu/debug.c
index 0f58a69..915739c 100644
--- a/drivers/bios_emulator/x86emu/debug.c
+++ b/drivers/bios_emulator/x86emu/debug.c
@@ -40,6 +40,8 @@
#include "x86emu/x86emui.h"
#include <stdarg.h>
+#if defined(CONFIG_BIOSEMU)
+
/*----------------------------- Implementation ----------------------------*/
#ifdef DEBUG
@@ -459,3 +461,5 @@ void x86emu_dump_xregs(void)
printk("NC ");
printk("\n");
}
+
+#endif
diff --git a/drivers/bios_emulator/x86emu/decode.c b/drivers/bios_emulator/x86emu/decode.c
index 1e2dcfe..879f0a0 100644
--- a/drivers/bios_emulator/x86emu/decode.c
+++ b/drivers/bios_emulator/x86emu/decode.c
@@ -39,6 +39,8 @@
#include "x86emu/x86emui.h"
+#if defined(CONFIG_BIOSEMU)
+
/*----------------------------- Implementation ----------------------------*/
/****************************************************************************
@@ -1142,3 +1144,5 @@ unsigned decode_rmXX_address(int mod, int rm)
return decode_rm01_address(rm);
return decode_rm10_address(rm);
}
+
+#endif
diff --git a/drivers/bios_emulator/x86emu/ops.c b/drivers/bios_emulator/x86emu/ops.c
index d1380ce..d334fb5 100644
--- a/drivers/bios_emulator/x86emu/ops.c
+++ b/drivers/bios_emulator/x86emu/ops.c
@@ -76,6 +76,9 @@
****************************************************************************/
#include "x86emu/x86emui.h"
+
+#if defined(CONFIG_BIOSEMU)
+
/*----------------------------- Implementation ----------------------------*/
/* constant arrays to do several instructions in just one function */
@@ -5429,3 +5432,5 @@ void (*x86emu_optab[256])(u8) __attribute__ ((section(".got2"))) =
/* 0xfe */ x86emuOp_opcFE_byte_RM,
/* 0xff */ x86emuOp_opcFF_word_RM,
};
+
+#endif
diff --git a/drivers/bios_emulator/x86emu/ops2.c b/drivers/bios_emulator/x86emu/ops2.c
index 631a340..81c0d49 100644
--- a/drivers/bios_emulator/x86emu/ops2.c
+++ b/drivers/bios_emulator/x86emu/ops2.c
@@ -46,6 +46,8 @@
#include "x86emu/x86emui.h"
+#if defined(CONFIG_BIOSEMU)
+
/*----------------------------- Implementation ----------------------------*/
/****************************************************************************
@@ -1768,3 +1770,5 @@ void (*x86emu_optab2[256])(u8) __attribute__((section(".got2"))) =
/* 0xfe */ x86emuOp2_illegal_op,
/* 0xff */ x86emuOp2_illegal_op,
};
+
+#endif
diff --git a/drivers/bios_emulator/x86emu/prim_ops.c b/drivers/bios_emulator/x86emu/prim_ops.c
index e0827d7..c1152ea 100644
--- a/drivers/bios_emulator/x86emu/prim_ops.c
+++ b/drivers/bios_emulator/x86emu/prim_ops.c
@@ -100,6 +100,8 @@
#define PRIM_OPS_NO_REDEFINE_ASM
#include "x86emu/x86emui.h"
+#if defined(CONFIG_BIOSEMU)
+
/*------------------------- Global Variables ------------------------------*/
static u32 x86emu_parity_tab[8] =
@@ -2443,3 +2445,5 @@ DB( if (CHECK_SP_ACCESS())
M.x86.R_SP += 4;
return res;
}
+
+#endif
diff --git a/drivers/bios_emulator/x86emu/sys.c b/drivers/bios_emulator/x86emu/sys.c
index bb7fcd9..566389f 100644
--- a/drivers/bios_emulator/x86emu/sys.c
+++ b/drivers/bios_emulator/x86emu/sys.c
@@ -41,6 +41,8 @@
#include "x86emu/x86emui.h"
+#if defined(CONFIG_BIOSEMU)
+
/*------------------------- Global Variables ------------------------------*/
X86EMU_sysEnv _X86EMU_env; /* Global emulator machine state */
@@ -320,3 +322,5 @@ void X86EMU_prepareForInt(int num)
M.x86.R_IP = mem_access_word(num * 4);
M.x86.intr = 0;
}
+
+#endif
--
1.5.1
^ permalink raw reply related [flat|nested] 10+ messages in thread* [U-Boot-Users] [PATCH] Minor fix for bios emulator makefile
2007-08-07 8:17 [U-Boot-Users] [PATCH] Add CONFIG_BIOSEMU define to guard all the bios emulator code Jason Jin
@ 2007-08-07 8:17 ` Jason Jin
2007-08-07 14:37 ` Wolfgang Denk
2007-08-07 14:21 ` [U-Boot-Users] [PATCH] Add CONFIG_BIOSEMU define to guard all the bios emulator code Jerry Van Baren
2007-08-07 14:41 ` Wolfgang Denk
2 siblings, 1 reply; 10+ messages in thread
From: Jason Jin @ 2007-08-07 8:17 UTC (permalink / raw)
To: u-boot
Add $(obj) to LIB avoiding objects be built in the source dir
---
drivers/bios_emulator/Makefile | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/bios_emulator/Makefile b/drivers/bios_emulator/Makefile
index ba7d436..586e83b 100644
--- a/drivers/bios_emulator/Makefile
+++ b/drivers/bios_emulator/Makefile
@@ -1,6 +1,6 @@
include $(TOPDIR)/config.mk
-LIB := libatibiosemu.a
+LIB := $(obj)libatibiosemu.a
X86DIR = ./x86emu
--
1.5.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [U-Boot-Users] [PATCH] Minor fix for bios emulator makefile
2007-08-07 8:17 ` [U-Boot-Users] [PATCH] Minor fix for bios emulator makefile Jason Jin
@ 2007-08-07 14:37 ` Wolfgang Denk
2007-08-08 0:24 ` Jin Zhengxiong-R64188
0 siblings, 1 reply; 10+ messages in thread
From: Wolfgang Denk @ 2007-08-07 14:37 UTC (permalink / raw)
To: u-boot
In message <1186474628168-git-send-email-Jason.jin@freescale.com> you wrote:
> Add $(obj) to LIB avoiding objects be built in the source dir
> ---
> drivers/bios_emulator/Makefile | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/bios_emulator/Makefile b/drivers/bios_emulator/Makefile
> index ba7d436..586e83b 100644
> --- a/drivers/bios_emulator/Makefile
> +++ b/drivers/bios_emulator/Makefile
> @@ -1,6 +1,6 @@
> include $(TOPDIR)/config.mk
>
> -LIB := libatibiosemu.a
> +LIB := $(obj)libatibiosemu.a
>
> X86DIR = ./x86emu
>
> --
> 1.5.1
>
>
Signed-off-by line missing. Please add and repost.
Best regards,
Wolfgang Denk
--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
It would seem that evil retreats when forcibly confronted
-- Yarnek of Excalbia, "The Savage Curtain", stardate 5906.5
^ permalink raw reply [flat|nested] 10+ messages in thread
* [U-Boot-Users] [PATCH] Minor fix for bios emulator makefile
2007-08-07 14:37 ` Wolfgang Denk
@ 2007-08-08 0:24 ` Jin Zhengxiong-R64188
0 siblings, 0 replies; 10+ messages in thread
From: Jin Zhengxiong-R64188 @ 2007-08-08 0:24 UTC (permalink / raw)
To: u-boot
> -----Original Message-----
> From: wd at denx.de [mailto:wd at denx.de]
> Sent: Tuesday, August 07, 2007 10:38 PM
> To: Jin Zhengxiong-R64188
> Cc: u-boot-users at lists.sourceforge.net; Loeliger Jon-LOELIGER
> Subject: Re: [PATCH] Minor fix for bios emulator makefile
>
> In message
> <1186474628168-git-send-email-Jason.jin@freescale.com> you wrote:
> > Add $(obj) to LIB avoiding objects be built in the source dir
> > ---
> > drivers/bios_emulator/Makefile | 2 +-
> > 1 files changed, 1 insertions(+), 1 deletions(-)
> >
> > diff --git a/drivers/bios_emulator/Makefile
> > b/drivers/bios_emulator/Makefile index ba7d436..586e83b 100644
> > --- a/drivers/bios_emulator/Makefile
> > +++ b/drivers/bios_emulator/Makefile
> > @@ -1,6 +1,6 @@
> > include $(TOPDIR)/config.mk
> >
> > -LIB := libatibiosemu.a
> > +LIB := $(obj)libatibiosemu.a
> >
> > X86DIR = ./x86emu
> >
> > --
> > 1.5.1
> >
> >
>
> Signed-off-by line missing. Please add and repost.
Sorry for that, there's some issue in my sendmail.
> Best regards,
>
> Wolfgang Denk
>
> --
> DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
> HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
> Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email:
> wd at denx.de It would seem that evil retreats when forcibly confronted
> -- Yarnek of Excalbia, "The Savage Curtain", stardate 5906.5
>
^ permalink raw reply [flat|nested] 10+ messages in thread
* [U-Boot-Users] [PATCH] Add CONFIG_BIOSEMU define to guard all the bios emulator code
2007-08-07 8:17 [U-Boot-Users] [PATCH] Add CONFIG_BIOSEMU define to guard all the bios emulator code Jason Jin
2007-08-07 8:17 ` [U-Boot-Users] [PATCH] Minor fix for bios emulator makefile Jason Jin
@ 2007-08-07 14:21 ` Jerry Van Baren
2007-08-07 14:41 ` Wolfgang Denk
2 siblings, 0 replies; 10+ messages in thread
From: Jerry Van Baren @ 2007-08-07 14:21 UTC (permalink / raw)
To: u-boot
Jason Jin wrote:
> This patch fix the compile issue on the board that did not enable the bios emulator
> ---
Fixes a bad brokenness, should be applied ASAP.
Acked-by: Jerry Van Baren <vanbaren@cideas.com>
> drivers/bios_emulator/besys.c | 2 ++
> drivers/bios_emulator/bios.c | 2 ++
> drivers/bios_emulator/biosemu.c | 3 +++
> drivers/bios_emulator/x86emu/debug.c | 4 ++++
> drivers/bios_emulator/x86emu/decode.c | 4 ++++
> drivers/bios_emulator/x86emu/ops.c | 5 +++++
> drivers/bios_emulator/x86emu/ops2.c | 4 ++++
> drivers/bios_emulator/x86emu/prim_ops.c | 4 ++++
> drivers/bios_emulator/x86emu/sys.c | 4 ++++
> 9 files changed, 32 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/bios_emulator/besys.c b/drivers/bios_emulator/besys.c
> index 2a8e1a0..4c4bc8d 100644
> --- a/drivers/bios_emulator/besys.c
> +++ b/drivers/bios_emulator/besys.c
> @@ -49,6 +49,7 @@
>
> #include "biosemui.h"
>
> +#if defined(CONFIG_BIOSEMU)
[snip rest of same]
^ permalink raw reply [flat|nested] 10+ messages in thread
* [U-Boot-Users] [PATCH] Add CONFIG_BIOSEMU define to guard all the bios emulator code
2007-08-07 8:17 [U-Boot-Users] [PATCH] Add CONFIG_BIOSEMU define to guard all the bios emulator code Jason Jin
2007-08-07 8:17 ` [U-Boot-Users] [PATCH] Minor fix for bios emulator makefile Jason Jin
2007-08-07 14:21 ` [U-Boot-Users] [PATCH] Add CONFIG_BIOSEMU define to guard all the bios emulator code Jerry Van Baren
@ 2007-08-07 14:41 ` Wolfgang Denk
2 siblings, 0 replies; 10+ messages in thread
From: Wolfgang Denk @ 2007-08-07 14:41 UTC (permalink / raw)
To: u-boot
In message <11864746273796-git-send-email-Jason.jin@freescale.com> you wrote:
> This patch fix the compile issue on the board that did not enable the bios emulator
> ---
Signed-off-by line missing. Please add and repost.
Best regards,
Wolfgang Denk
--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
"Security is mostly a superstition. It does not exist in nature...
Life is either a daring adventure or nothing." - Helen Keller
^ permalink raw reply [flat|nested] 10+ messages in thread
* [U-Boot-Users] [PATCH] Add CONFIG_BIOSEMU define to guard all the bios emulator code
@ 2007-08-08 0:33 Jason Jin
2007-08-09 21:25 ` Wolfgang Denk
0 siblings, 1 reply; 10+ messages in thread
From: Jason Jin @ 2007-08-08 0:33 UTC (permalink / raw)
To: u-boot
Signed-off-by: Jason Jin <Jason.jin@freescale.com>
This patch fix the compile issue on the board that did not enable the bios emulator
---
drivers/bios_emulator/besys.c | 2 ++
drivers/bios_emulator/bios.c | 2 ++
drivers/bios_emulator/biosemu.c | 3 +++
drivers/bios_emulator/x86emu/debug.c | 4 ++++
drivers/bios_emulator/x86emu/decode.c | 4 ++++
drivers/bios_emulator/x86emu/ops.c | 5 +++++
drivers/bios_emulator/x86emu/ops2.c | 4 ++++
drivers/bios_emulator/x86emu/prim_ops.c | 4 ++++
drivers/bios_emulator/x86emu/sys.c | 4 ++++
9 files changed, 32 insertions(+), 0 deletions(-)
diff --git a/drivers/bios_emulator/besys.c b/drivers/bios_emulator/besys.c
index 2a8e1a0..4c4bc8d 100644
--- a/drivers/bios_emulator/besys.c
+++ b/drivers/bios_emulator/besys.c
@@ -49,6 +49,7 @@
#include "biosemui.h"
+#if defined(CONFIG_BIOSEMU)
/*------------------------- Global Variables ------------------------------*/
#ifndef __i386__
@@ -717,3 +718,4 @@ void X86API BE_outl(X86EMU_pioAddr port, u32 val)
#endif
LOG_outpd(port, val);
}
+#endif
diff --git a/drivers/bios_emulator/bios.c b/drivers/bios_emulator/bios.c
index ed5437e..7aa1bfb 100644
--- a/drivers/bios_emulator/bios.c
+++ b/drivers/bios_emulator/bios.c
@@ -43,6 +43,7 @@
#include "biosemui.h"
+#if defined(CONFIG_BIOSEMU)
/*----------------------------- Implementation ----------------------------*/
/****************************************************************************
@@ -319,3 +320,4 @@ void _BE_bios_init(u32 * intrTab)
bios_intr_tab[0x6D] = int10;
X86EMU_setupIntrFuncs(bios_intr_tab);
}
+#endif
diff --git a/drivers/bios_emulator/biosemu.c b/drivers/bios_emulator/biosemu.c
index 06d4ad3..4c3aedf 100644
--- a/drivers/bios_emulator/biosemu.c
+++ b/drivers/bios_emulator/biosemu.c
@@ -48,6 +48,8 @@
#include "biosemui.h"
#include <malloc.h>
+#if defined(CONFIG_BIOSEMU)
+
BE_sysEnv _BE_env = {{0}};
static X86EMU_memFuncs _BE_mem __attribute__((section(".got2"))) = {
BE_rdb,
@@ -368,3 +370,4 @@ int X86API BE_int86x(int intno, RMREGS * in, RMREGS * out, RMSREGS * sregs)
sregs->gs = M.x86.R_GS;
return out->x.ax;
}
+#endif
diff --git a/drivers/bios_emulator/x86emu/debug.c b/drivers/bios_emulator/x86emu/debug.c
index 0f58a69..915739c 100644
--- a/drivers/bios_emulator/x86emu/debug.c
+++ b/drivers/bios_emulator/x86emu/debug.c
@@ -40,6 +40,8 @@
#include "x86emu/x86emui.h"
#include <stdarg.h>
+#if defined(CONFIG_BIOSEMU)
+
/*----------------------------- Implementation ----------------------------*/
#ifdef DEBUG
@@ -459,3 +461,5 @@ void x86emu_dump_xregs(void)
printk("NC ");
printk("\n");
}
+
+#endif
diff --git a/drivers/bios_emulator/x86emu/decode.c b/drivers/bios_emulator/x86emu/decode.c
index 1e2dcfe..879f0a0 100644
--- a/drivers/bios_emulator/x86emu/decode.c
+++ b/drivers/bios_emulator/x86emu/decode.c
@@ -39,6 +39,8 @@
#include "x86emu/x86emui.h"
+#if defined(CONFIG_BIOSEMU)
+
/*----------------------------- Implementation ----------------------------*/
/****************************************************************************
@@ -1142,3 +1144,5 @@ unsigned decode_rmXX_address(int mod, int rm)
return decode_rm01_address(rm);
return decode_rm10_address(rm);
}
+
+#endif
diff --git a/drivers/bios_emulator/x86emu/ops.c b/drivers/bios_emulator/x86emu/ops.c
index d1380ce..d334fb5 100644
--- a/drivers/bios_emulator/x86emu/ops.c
+++ b/drivers/bios_emulator/x86emu/ops.c
@@ -76,6 +76,9 @@
****************************************************************************/
#include "x86emu/x86emui.h"
+
+#if defined(CONFIG_BIOSEMU)
+
/*----------------------------- Implementation ----------------------------*/
/* constant arrays to do several instructions in just one function */
@@ -5429,3 +5432,5 @@ void (*x86emu_optab[256])(u8) __attribute__ ((section(".got2"))) =
/* 0xfe */ x86emuOp_opcFE_byte_RM,
/* 0xff */ x86emuOp_opcFF_word_RM,
};
+
+#endif
diff --git a/drivers/bios_emulator/x86emu/ops2.c b/drivers/bios_emulator/x86emu/ops2.c
index 631a340..81c0d49 100644
--- a/drivers/bios_emulator/x86emu/ops2.c
+++ b/drivers/bios_emulator/x86emu/ops2.c
@@ -46,6 +46,8 @@
#include "x86emu/x86emui.h"
+#if defined(CONFIG_BIOSEMU)
+
/*----------------------------- Implementation ----------------------------*/
/****************************************************************************
@@ -1768,3 +1770,5 @@ void (*x86emu_optab2[256])(u8) __attribute__((section(".got2"))) =
/* 0xfe */ x86emuOp2_illegal_op,
/* 0xff */ x86emuOp2_illegal_op,
};
+
+#endif
diff --git a/drivers/bios_emulator/x86emu/prim_ops.c b/drivers/bios_emulator/x86emu/prim_ops.c
index e0827d7..c1152ea 100644
--- a/drivers/bios_emulator/x86emu/prim_ops.c
+++ b/drivers/bios_emulator/x86emu/prim_ops.c
@@ -100,6 +100,8 @@
#define PRIM_OPS_NO_REDEFINE_ASM
#include "x86emu/x86emui.h"
+#if defined(CONFIG_BIOSEMU)
+
/*------------------------- Global Variables ------------------------------*/
static u32 x86emu_parity_tab[8] =
@@ -2443,3 +2445,5 @@ DB( if (CHECK_SP_ACCESS())
M.x86.R_SP += 4;
return res;
}
+
+#endif
diff --git a/drivers/bios_emulator/x86emu/sys.c b/drivers/bios_emulator/x86emu/sys.c
index bb7fcd9..566389f 100644
--- a/drivers/bios_emulator/x86emu/sys.c
+++ b/drivers/bios_emulator/x86emu/sys.c
@@ -41,6 +41,8 @@
#include "x86emu/x86emui.h"
+#if defined(CONFIG_BIOSEMU)
+
/*------------------------- Global Variables ------------------------------*/
X86EMU_sysEnv _X86EMU_env; /* Global emulator machine state */
@@ -320,3 +322,5 @@ void X86EMU_prepareForInt(int num)
M.x86.R_IP = mem_access_word(num * 4);
M.x86.intr = 0;
}
+
+#endif
--
1.5.1
^ permalink raw reply related [flat|nested] 10+ messages in thread* [U-Boot-Users] [PATCH] Add CONFIG_BIOSEMU define to guard all the bios emulator code
2007-08-08 0:33 Jason Jin
@ 2007-08-09 21:25 ` Wolfgang Denk
0 siblings, 0 replies; 10+ messages in thread
From: Wolfgang Denk @ 2007-08-09 21:25 UTC (permalink / raw)
To: u-boot
In message <11865331924064-git-send-email-Jason.jin@freescale.com> you wrote:
> Signed-off-by: Jason Jin <Jason.jin@freescale.com>
>
> This patch fix the compile issue on the board that did not enable the bios emulator
Applied, thanks.
Best regards,
Wolfgang Denk
--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
The faster I go, the behinder I get. -- Lewis Carroll
^ permalink raw reply [flat|nested] 10+ messages in thread
* [U-Boot-Users] [PATCH] Add CONFIG_BIOSEMU define to guard all the bios emulator code
@ 2007-08-08 1:01 Jason Jin
2007-08-08 15:54 ` Dirk Behme
0 siblings, 1 reply; 10+ messages in thread
From: Jason Jin @ 2007-08-08 1:01 UTC (permalink / raw)
To: u-boot
This patch fix the compile issue on the board that did not enable the bios emulator
Signed-off-by: Jason Jin <Jason.jin@freescale.com>
---
drivers/bios_emulator/besys.c | 2 ++
drivers/bios_emulator/bios.c | 2 ++
drivers/bios_emulator/biosemu.c | 3 +++
drivers/bios_emulator/x86emu/debug.c | 4 ++++
drivers/bios_emulator/x86emu/decode.c | 4 ++++
drivers/bios_emulator/x86emu/ops.c | 5 +++++
drivers/bios_emulator/x86emu/ops2.c | 4 ++++
drivers/bios_emulator/x86emu/prim_ops.c | 4 ++++
drivers/bios_emulator/x86emu/sys.c | 4 ++++
9 files changed, 32 insertions(+), 0 deletions(-)
diff --git a/drivers/bios_emulator/besys.c b/drivers/bios_emulator/besys.c
index 2a8e1a0..4c4bc8d 100644
--- a/drivers/bios_emulator/besys.c
+++ b/drivers/bios_emulator/besys.c
@@ -49,6 +49,7 @@
#include "biosemui.h"
+#if defined(CONFIG_BIOSEMU)
/*------------------------- Global Variables ------------------------------*/
#ifndef __i386__
@@ -717,3 +718,4 @@ void X86API BE_outl(X86EMU_pioAddr port, u32 val)
#endif
LOG_outpd(port, val);
}
+#endif
diff --git a/drivers/bios_emulator/bios.c b/drivers/bios_emulator/bios.c
index ed5437e..7aa1bfb 100644
--- a/drivers/bios_emulator/bios.c
+++ b/drivers/bios_emulator/bios.c
@@ -43,6 +43,7 @@
#include "biosemui.h"
+#if defined(CONFIG_BIOSEMU)
/*----------------------------- Implementation ----------------------------*/
/****************************************************************************
@@ -319,3 +320,4 @@ void _BE_bios_init(u32 * intrTab)
bios_intr_tab[0x6D] = int10;
X86EMU_setupIntrFuncs(bios_intr_tab);
}
+#endif
diff --git a/drivers/bios_emulator/biosemu.c b/drivers/bios_emulator/biosemu.c
index 06d4ad3..4c3aedf 100644
--- a/drivers/bios_emulator/biosemu.c
+++ b/drivers/bios_emulator/biosemu.c
@@ -48,6 +48,8 @@
#include "biosemui.h"
#include <malloc.h>
+#if defined(CONFIG_BIOSEMU)
+
BE_sysEnv _BE_env = {{0}};
static X86EMU_memFuncs _BE_mem __attribute__((section(".got2"))) = {
BE_rdb,
@@ -368,3 +370,4 @@ int X86API BE_int86x(int intno, RMREGS * in, RMREGS * out, RMSREGS * sregs)
sregs->gs = M.x86.R_GS;
return out->x.ax;
}
+#endif
diff --git a/drivers/bios_emulator/x86emu/debug.c b/drivers/bios_emulator/x86emu/debug.c
index 0f58a69..915739c 100644
--- a/drivers/bios_emulator/x86emu/debug.c
+++ b/drivers/bios_emulator/x86emu/debug.c
@@ -40,6 +40,8 @@
#include "x86emu/x86emui.h"
#include <stdarg.h>
+#if defined(CONFIG_BIOSEMU)
+
/*----------------------------- Implementation ----------------------------*/
#ifdef DEBUG
@@ -459,3 +461,5 @@ void x86emu_dump_xregs(void)
printk("NC ");
printk("\n");
}
+
+#endif
diff --git a/drivers/bios_emulator/x86emu/decode.c b/drivers/bios_emulator/x86emu/decode.c
index 1e2dcfe..879f0a0 100644
--- a/drivers/bios_emulator/x86emu/decode.c
+++ b/drivers/bios_emulator/x86emu/decode.c
@@ -39,6 +39,8 @@
#include "x86emu/x86emui.h"
+#if defined(CONFIG_BIOSEMU)
+
/*----------------------------- Implementation ----------------------------*/
/****************************************************************************
@@ -1142,3 +1144,5 @@ unsigned decode_rmXX_address(int mod, int rm)
return decode_rm01_address(rm);
return decode_rm10_address(rm);
}
+
+#endif
diff --git a/drivers/bios_emulator/x86emu/ops.c b/drivers/bios_emulator/x86emu/ops.c
index d1380ce..d334fb5 100644
--- a/drivers/bios_emulator/x86emu/ops.c
+++ b/drivers/bios_emulator/x86emu/ops.c
@@ -76,6 +76,9 @@
****************************************************************************/
#include "x86emu/x86emui.h"
+
+#if defined(CONFIG_BIOSEMU)
+
/*----------------------------- Implementation ----------------------------*/
/* constant arrays to do several instructions in just one function */
@@ -5429,3 +5432,5 @@ void (*x86emu_optab[256])(u8) __attribute__ ((section(".got2"))) =
/* 0xfe */ x86emuOp_opcFE_byte_RM,
/* 0xff */ x86emuOp_opcFF_word_RM,
};
+
+#endif
diff --git a/drivers/bios_emulator/x86emu/ops2.c b/drivers/bios_emulator/x86emu/ops2.c
index 631a340..81c0d49 100644
--- a/drivers/bios_emulator/x86emu/ops2.c
+++ b/drivers/bios_emulator/x86emu/ops2.c
@@ -46,6 +46,8 @@
#include "x86emu/x86emui.h"
+#if defined(CONFIG_BIOSEMU)
+
/*----------------------------- Implementation ----------------------------*/
/****************************************************************************
@@ -1768,3 +1770,5 @@ void (*x86emu_optab2[256])(u8) __attribute__((section(".got2"))) =
/* 0xfe */ x86emuOp2_illegal_op,
/* 0xff */ x86emuOp2_illegal_op,
};
+
+#endif
diff --git a/drivers/bios_emulator/x86emu/prim_ops.c b/drivers/bios_emulator/x86emu/prim_ops.c
index e0827d7..c1152ea 100644
--- a/drivers/bios_emulator/x86emu/prim_ops.c
+++ b/drivers/bios_emulator/x86emu/prim_ops.c
@@ -100,6 +100,8 @@
#define PRIM_OPS_NO_REDEFINE_ASM
#include "x86emu/x86emui.h"
+#if defined(CONFIG_BIOSEMU)
+
/*------------------------- Global Variables ------------------------------*/
static u32 x86emu_parity_tab[8] =
@@ -2443,3 +2445,5 @@ DB( if (CHECK_SP_ACCESS())
M.x86.R_SP += 4;
return res;
}
+
+#endif
diff --git a/drivers/bios_emulator/x86emu/sys.c b/drivers/bios_emulator/x86emu/sys.c
index bb7fcd9..566389f 100644
--- a/drivers/bios_emulator/x86emu/sys.c
+++ b/drivers/bios_emulator/x86emu/sys.c
@@ -41,6 +41,8 @@
#include "x86emu/x86emui.h"
+#if defined(CONFIG_BIOSEMU)
+
/*------------------------- Global Variables ------------------------------*/
X86EMU_sysEnv _X86EMU_env; /* Global emulator machine state */
@@ -320,3 +322,5 @@ void X86EMU_prepareForInt(int num)
M.x86.R_IP = mem_access_word(num * 4);
M.x86.intr = 0;
}
+
+#endif
--
1.5.1
^ permalink raw reply related [flat|nested] 10+ messages in thread* [U-Boot-Users] [PATCH] Add CONFIG_BIOSEMU define to guard all the bios emulator code
2007-08-08 1:01 Jason Jin
@ 2007-08-08 15:54 ` Dirk Behme
0 siblings, 0 replies; 10+ messages in thread
From: Dirk Behme @ 2007-08-08 15:54 UTC (permalink / raw)
To: u-boot
Jason Jin wrote:
> This patch fix the compile issue on the board that did not enable the bios emulator
>
> Signed-off-by: Jason Jin <Jason.jin@freescale.com>
Acked-by: Dirk Behme <dirk.behme@gmail.com>
> ---
> drivers/bios_emulator/besys.c | 2 ++
> drivers/bios_emulator/bios.c | 2 ++
> drivers/bios_emulator/biosemu.c | 3 +++
> drivers/bios_emulator/x86emu/debug.c | 4 ++++
> drivers/bios_emulator/x86emu/decode.c | 4 ++++
> drivers/bios_emulator/x86emu/ops.c | 5 +++++
> drivers/bios_emulator/x86emu/ops2.c | 4 ++++
> drivers/bios_emulator/x86emu/prim_ops.c | 4 ++++
> drivers/bios_emulator/x86emu/sys.c | 4 ++++
> 9 files changed, 32 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/bios_emulator/besys.c b/drivers/bios_emulator/besys.c
> index 2a8e1a0..4c4bc8d 100644
> --- a/drivers/bios_emulator/besys.c
> +++ b/drivers/bios_emulator/besys.c
> @@ -49,6 +49,7 @@
>
> #include "biosemui.h"
>
> +#if defined(CONFIG_BIOSEMU)
> /*------------------------- Global Variables ------------------------------*/
>
> #ifndef __i386__
> @@ -717,3 +718,4 @@ void X86API BE_outl(X86EMU_pioAddr port, u32 val)
> #endif
> LOG_outpd(port, val);
> }
> +#endif
> diff --git a/drivers/bios_emulator/bios.c b/drivers/bios_emulator/bios.c
> index ed5437e..7aa1bfb 100644
> --- a/drivers/bios_emulator/bios.c
> +++ b/drivers/bios_emulator/bios.c
> @@ -43,6 +43,7 @@
>
> #include "biosemui.h"
>
> +#if defined(CONFIG_BIOSEMU)
> /*----------------------------- Implementation ----------------------------*/
>
> /****************************************************************************
> @@ -319,3 +320,4 @@ void _BE_bios_init(u32 * intrTab)
> bios_intr_tab[0x6D] = int10;
> X86EMU_setupIntrFuncs(bios_intr_tab);
> }
> +#endif
> diff --git a/drivers/bios_emulator/biosemu.c b/drivers/bios_emulator/biosemu.c
> index 06d4ad3..4c3aedf 100644
> --- a/drivers/bios_emulator/biosemu.c
> +++ b/drivers/bios_emulator/biosemu.c
> @@ -48,6 +48,8 @@
> #include "biosemui.h"
> #include <malloc.h>
>
> +#if defined(CONFIG_BIOSEMU)
> +
> BE_sysEnv _BE_env = {{0}};
> static X86EMU_memFuncs _BE_mem __attribute__((section(".got2"))) = {
> BE_rdb,
> @@ -368,3 +370,4 @@ int X86API BE_int86x(int intno, RMREGS * in, RMREGS * out, RMSREGS * sregs)
> sregs->gs = M.x86.R_GS;
> return out->x.ax;
> }
> +#endif
> diff --git a/drivers/bios_emulator/x86emu/debug.c b/drivers/bios_emulator/x86emu/debug.c
> index 0f58a69..915739c 100644
> --- a/drivers/bios_emulator/x86emu/debug.c
> +++ b/drivers/bios_emulator/x86emu/debug.c
> @@ -40,6 +40,8 @@
> #include "x86emu/x86emui.h"
> #include <stdarg.h>
>
> +#if defined(CONFIG_BIOSEMU)
> +
> /*----------------------------- Implementation ----------------------------*/
>
> #ifdef DEBUG
> @@ -459,3 +461,5 @@ void x86emu_dump_xregs(void)
> printk("NC ");
> printk("\n");
> }
> +
> +#endif
> diff --git a/drivers/bios_emulator/x86emu/decode.c b/drivers/bios_emulator/x86emu/decode.c
> index 1e2dcfe..879f0a0 100644
> --- a/drivers/bios_emulator/x86emu/decode.c
> +++ b/drivers/bios_emulator/x86emu/decode.c
> @@ -39,6 +39,8 @@
>
> #include "x86emu/x86emui.h"
>
> +#if defined(CONFIG_BIOSEMU)
> +
> /*----------------------------- Implementation ----------------------------*/
>
> /****************************************************************************
> @@ -1142,3 +1144,5 @@ unsigned decode_rmXX_address(int mod, int rm)
> return decode_rm01_address(rm);
> return decode_rm10_address(rm);
> }
> +
> +#endif
> diff --git a/drivers/bios_emulator/x86emu/ops.c b/drivers/bios_emulator/x86emu/ops.c
> index d1380ce..d334fb5 100644
> --- a/drivers/bios_emulator/x86emu/ops.c
> +++ b/drivers/bios_emulator/x86emu/ops.c
> @@ -76,6 +76,9 @@
> ****************************************************************************/
>
> #include "x86emu/x86emui.h"
> +
> +#if defined(CONFIG_BIOSEMU)
> +
> /*----------------------------- Implementation ----------------------------*/
>
> /* constant arrays to do several instructions in just one function */
> @@ -5429,3 +5432,5 @@ void (*x86emu_optab[256])(u8) __attribute__ ((section(".got2"))) =
> /* 0xfe */ x86emuOp_opcFE_byte_RM,
> /* 0xff */ x86emuOp_opcFF_word_RM,
> };
> +
> +#endif
> diff --git a/drivers/bios_emulator/x86emu/ops2.c b/drivers/bios_emulator/x86emu/ops2.c
> index 631a340..81c0d49 100644
> --- a/drivers/bios_emulator/x86emu/ops2.c
> +++ b/drivers/bios_emulator/x86emu/ops2.c
> @@ -46,6 +46,8 @@
>
> #include "x86emu/x86emui.h"
>
> +#if defined(CONFIG_BIOSEMU)
> +
> /*----------------------------- Implementation ----------------------------*/
>
> /****************************************************************************
> @@ -1768,3 +1770,5 @@ void (*x86emu_optab2[256])(u8) __attribute__((section(".got2"))) =
> /* 0xfe */ x86emuOp2_illegal_op,
> /* 0xff */ x86emuOp2_illegal_op,
> };
> +
> +#endif
> diff --git a/drivers/bios_emulator/x86emu/prim_ops.c b/drivers/bios_emulator/x86emu/prim_ops.c
> index e0827d7..c1152ea 100644
> --- a/drivers/bios_emulator/x86emu/prim_ops.c
> +++ b/drivers/bios_emulator/x86emu/prim_ops.c
> @@ -100,6 +100,8 @@
> #define PRIM_OPS_NO_REDEFINE_ASM
> #include "x86emu/x86emui.h"
>
> +#if defined(CONFIG_BIOSEMU)
> +
> /*------------------------- Global Variables ------------------------------*/
>
> static u32 x86emu_parity_tab[8] =
> @@ -2443,3 +2445,5 @@ DB( if (CHECK_SP_ACCESS())
> M.x86.R_SP += 4;
> return res;
> }
> +
> +#endif
> diff --git a/drivers/bios_emulator/x86emu/sys.c b/drivers/bios_emulator/x86emu/sys.c
> index bb7fcd9..566389f 100644
> --- a/drivers/bios_emulator/x86emu/sys.c
> +++ b/drivers/bios_emulator/x86emu/sys.c
> @@ -41,6 +41,8 @@
>
> #include "x86emu/x86emui.h"
>
> +#if defined(CONFIG_BIOSEMU)
> +
> /*------------------------- Global Variables ------------------------------*/
>
> X86EMU_sysEnv _X86EMU_env; /* Global emulator machine state */
> @@ -320,3 +322,5 @@ void X86EMU_prepareForInt(int num)
> M.x86.R_IP = mem_access_word(num * 4);
> M.x86.intr = 0;
> }
> +
> +#endif
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2007-08-09 21:25 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-08-07 8:17 [U-Boot-Users] [PATCH] Add CONFIG_BIOSEMU define to guard all the bios emulator code Jason Jin
2007-08-07 8:17 ` [U-Boot-Users] [PATCH] Minor fix for bios emulator makefile Jason Jin
2007-08-07 14:37 ` Wolfgang Denk
2007-08-08 0:24 ` Jin Zhengxiong-R64188
2007-08-07 14:21 ` [U-Boot-Users] [PATCH] Add CONFIG_BIOSEMU define to guard all the bios emulator code Jerry Van Baren
2007-08-07 14:41 ` Wolfgang Denk
-- strict thread matches above, loose matches on Subject: below --
2007-08-08 0:33 Jason Jin
2007-08-09 21:25 ` Wolfgang Denk
2007-08-08 1:01 Jason Jin
2007-08-08 15:54 ` Dirk Behme
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox