Merge with git+ssh://atlas/home/wd/git/u-boot/master

This commit is contained in:
Wolfgang Denk 2007-08-09 23:49:30 +02:00
commit b0d2962faf
13 changed files with 41 additions and 4 deletions

View file

@ -34,6 +34,7 @@ HOSTARCH := $(shell uname -m | \
-e s/arm.*/arm/ \
-e s/sa110/arm/ \
-e s/powerpc/ppc/ \
-e s/ppc64/ppc/ \
-e s/macppc/ppc/)
HOSTOS := $(shell uname -s | tr '[:upper:]' '[:lower:]' | \

View file

@ -1,6 +1,6 @@
include $(TOPDIR)/config.mk
LIB := libatibiosemu.a
LIB := $(obj)libatibiosemu.a
X86DIR = ./x86emu

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -71,6 +71,7 @@ static struct tsec_info_struct tsec_info[] = {
#else
{TSEC1_PHY_ADDR, TSEC_GIGABIT, TSEC1_PHYIDX},
#endif
#else
{0, 0, 0},
#endif
#if defined(CONFIG_TSEC2)
@ -79,6 +80,7 @@ static struct tsec_info_struct tsec_info[] = {
#else
{TSEC2_PHY_ADDR, TSEC_GIGABIT, TSEC2_PHYIDX},
#endif
#else
{0, 0, 0},
#endif
#ifdef CONFIG_MPC85XX_FEC
@ -296,9 +298,9 @@ static int init_phy(struct eth_device *dev)
volatile tsec_t *regs = (volatile tsec_t *)(TSEC_BASE_ADDR);
/* Assign a Physical address to the TBI */
regs->tbipa = TBIPA_VALUE;
regs->tbipa = CFG_TBIPA_VALUE;
regs = (volatile tsec_t *)(TSEC_BASE_ADDR + TSEC_SIZE);
regs->tbipa = TBIPA_VALUE;
regs->tbipa = CFG_TBIPA_VALUE;
asm("sync");
/* Reset MII (due to new addresses) */

View file

@ -70,7 +70,9 @@
#define miim_end -2
#define miim_read -1
#define TBIPA_VALUE 0x1f
#ifndef CFG_TBIPA_VALUE
#define CFG_TBIPA_VALUE 0x1f
#endif
#define MIIMCFG_INIT_VALUE 0x00000003
#define MIIMCFG_RESET 0x80000000