liliana/r-link-uboot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Make Ethernet autonegotiation on INCA-IP work for all clock rates;

Browse Source 
allow selection of clock frequency as "make" target

* Implement memory autosizing code for IceCube boards

* Configure network port on INCA-IP for autonegotiation

* Fix overflow problem in network timeout code

* Patch by Richard Woodruff, 8 Aug 2003:
  Allow crc32 to be used at address 0x000 (crc32_no_comp, too).
This commit is contained in:
wdenk 2003-08-17 18:55:18 +00:00
parent ae3af05ec9
commit e0ac62d798
17 changed files with 303 additions and 221 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
CHANGELOG
View File

@ -2,6 +2,18 @@
Changes for U-Boot 0.4.5: Changes for U-Boot 0.4.5:
====================================================================== ======================================================================
* Make Ethernet autonegotiation on INCA-IP work for all clock rates;
allow selection of clock frequency as "make" target
* Implement memory autosizing code for IceCube boards
* Configure network port on INCA-IP for autonegotiation
* Fix overflow problem in network timeout code
* Patch by Richard Woodruff, 8 Aug 2003:
Allow crc32 to be used at address 0x000 (crc32_no_comp, too).
* Update for TQM board defaults: * Update for TQM board defaults:
disable clocks_in_mhz, enable boot count limit disable clocks_in_mhz, enable boot count limit

24
Makefile
View File

@ -848,8 +848,30 @@ sc520_spunk_rel_config : unconfig
## MIPS32 4Kc ## MIPS32 4Kc
######################################################################### #########################################################################
xtract_incaip = $(subst _100MHz,,$(subst _133MHz,,$(subst _150MHz,,$(subst _config,,$1))))
incaip_100MHz_config \
incaip_133MHz_config \
incaip_150MHz_config \
incaip_config: unconfig incaip_config: unconfig
@./mkconfig $(@:_config=) mips mips incaip @ >include/config.h
@[ -z "$(findstring _100MHz,$@)" ] || \
{ echo "#define CPU_CLOCK_RATE 100000000" >>include/config.h ; \
echo "... with 100MHz system clock" ; \
}
@[ -z "$(findstring _133MHz,$@)" ] || \
{ echo "#define CPU_CLOCK_RATE 133000000" >>include/config.h ; \
echo "... with 133MHz system clock" ; \
}
@[ -z "$(findstring _150MHz,$@)" ] || \
{ echo "#define CPU_CLOCK_RATE 150000000" >>include/config.h ; \
echo "... with 150MHz system clock" ; \
}
@./mkconfig -a $(call xtract_incaip,$@) mips mips incaip
#########################################################################
## MIPS64 5Kc
#########################################################################
purple_config : unconfig purple_config : unconfig
@./mkconfig $(@:_config=) mips mips purple @./mkconfig $(@:_config=) mips mips purple

122
board/icecube/icecube.c
View File

@ -25,35 +25,84 @@
#include <mpc5xxx.h> #include <mpc5xxx.h>
#include <pci.h> #include <pci.h>
static long int dram_size(long int *base, long int maxsize)
{
volatile long int *addr;
ulong cnt, val;
ulong save[32]; /* to make test non-destructive */
unsigned char i = 0;
for (cnt = (maxsize / sizeof (long)) >> 1; cnt > 0; cnt >>= 1) {
addr = base + cnt; /* pointer arith! */
save[i++] = *addr;
*addr = ~cnt;
}
/* write 0 to base address */
addr = base;
save[i] = *addr;
*addr = 0;
/* check at base address */
if ((val = *addr) != 0) {
*addr = save[i];
return (0);
}
for (cnt = 1; cnt < maxsize / sizeof (long); cnt <<= 1) {
addr = base + cnt; /* pointer arith! */
val = *addr;
*addr = save[--i];
if (val != (~cnt)) {
return (cnt * sizeof (long));
}
}
return (maxsize);
}
static void sdram_start (int hi_addr)
{
long hi_addr_bit = hi_addr ? 0x01000000 : 0;
/* unlock mode register */
*(vu_long *)MPC5XXX_SDRAM_CTRL = 0xd04f0000 | hi_addr_bit;
/* precharge all banks */
*(vu_long *)MPC5XXX_SDRAM_CTRL = 0xd04f0002 | hi_addr_bit;
/* set mode register */
#if defined(CONFIG_MPC5200)
*(vu_long *)MPC5XXX_SDRAM_MODE = 0x408d0000;
#elif defined(CONFIG_MGT5100)
*(vu_long *)MPC5XXX_SDRAM_MODE = 0x008d0000;
#endif
/* precharge all banks */
*(vu_long *)MPC5XXX_SDRAM_CTRL = 0xd04f0002 | hi_addr_bit;
/* auto refresh */
*(vu_long *)MPC5XXX_SDRAM_CTRL = 0xd04f0004 | hi_addr_bit;
/* set mode register */
*(vu_long *)MPC5XXX_SDRAM_MODE = 0x008d0000;
/* normal operation */
*(vu_long *)MPC5XXX_SDRAM_CTRL = 0x504f0000 | hi_addr_bit;
}
long int initdram (int board_type) long int initdram (int board_type)
{ {
ulong test1, test2, dramsize = 0;
#ifndef CFG_RAMBOOT #ifndef CFG_RAMBOOT
/* configure SDRAM start/end */ /* configure SDRAM start/end */
#if defined(CONFIG_MPC5200) #if defined(CONFIG_MPC5200)
*(vu_long *)MPC5XXX_SDRAM_CS0CFG = 0x00000018;/* 32M at 0x0 */ *(vu_long *)MPC5XXX_SDRAM_CS0CFG = 0x0000001e;/* 2G at 0x0 */
*(vu_long *)MPC5XXX_SDRAM_CS1CFG = 0x02000000;/* disabled */ *(vu_long *)MPC5XXX_SDRAM_CS1CFG = 0x80000000;/* disabled */
/* setup config registers */ /* setup config registers */
*(vu_long *)MPC5XXX_SDRAM_CONFIG1 = 0xc2233a00; *(vu_long *)MPC5XXX_SDRAM_CONFIG1 = 0xc2233a00;
*(vu_long *)MPC5XXX_SDRAM_CONFIG2 = 0x88b70004; *(vu_long *)MPC5XXX_SDRAM_CONFIG2 = 0x88b70004;
/* unlock mode register */
*(vu_long *)MPC5XXX_SDRAM_CTRL = 0xd04f0000;
/* precharge all banks */
*(vu_long *)MPC5XXX_SDRAM_CTRL = 0xd04f0002;
/* set mode register */
*(vu_long *)MPC5XXX_SDRAM_MODE = 0x408d0000;
/* precharge all banks */
*(vu_long *)MPC5XXX_SDRAM_CTRL = 0xd04f0002;
/* auto refresh */
*(vu_long *)MPC5XXX_SDRAM_CTRL = 0xd04f0004;
/* set mode register */
*(vu_long *)MPC5XXX_SDRAM_MODE = 0x008d0000;
/* normal operation */
*(vu_long *)MPC5XXX_SDRAM_CTRL = 0x504f0000;
#elif defined(CONFIG_MGT5100) #elif defined(CONFIG_MGT5100)
*(vu_long *)MPC5XXX_SDRAM_START = 0x00000000; *(vu_long *)MPC5XXX_SDRAM_START = 0x00000000;
*(vu_long *)MPC5XXX_SDRAM_STOP = 0x000007ff;/* 64M */ *(vu_long *)MPC5XXX_SDRAM_STOP = 0x0000ffff;/* 2G */
*(vu_long *)MPC5XXX_ADDECR |= (1 << 22); /* Enable SDRAM */ *(vu_long *)MPC5XXX_ADDECR |= (1 << 22); /* Enable SDRAM */
/* setup config registers */ /* setup config registers */
@ -62,33 +111,32 @@ long int initdram (int board_type)
/* address select register */ /* address select register */
*(vu_long *)MPC5XXX_SDRAM_XLBSEL = 0x03000000; *(vu_long *)MPC5XXX_SDRAM_XLBSEL = 0x03000000;
/* unlock mode register */
*(vu_long *)MPC5XXX_SDRAM_CTRL = 0xd14f0000;
/* precharge all banks */
*(vu_long *)MPC5XXX_SDRAM_CTRL = 0xd14f0002;
/* set mode register */
*(vu_long *)MPC5XXX_SDRAM_MODE = 0x008d0000;
/* precharge all banks */
*(vu_long *)MPC5XXX_SDRAM_CTRL = 0xd14f0002;
/* auto refresh */
*(vu_long *)MPC5XXX_SDRAM_CTRL = 0xd14f0004;
/* set mode register */
*(vu_long *)MPC5XXX_SDRAM_MODE = 0x008d0000;
/* normal operation */
*(vu_long *)MPC5XXX_SDRAM_CTRL = 0x514f0000;
#endif #endif
sdram_start(0);
test1 = dram_size((ulong *)CFG_SDRAM_BASE, 0x80000000);
sdram_start(1);
test2 = dram_size((ulong *)CFG_SDRAM_BASE, 0x80000000);
if (test1 > test2) {
sdram_start(0);
dramsize = test1;
} else {
dramsize = test2;
}
#if defined(CONFIG_MPC5200)
*(vu_long *)MPC5XXX_SDRAM_CS0CFG =
(0x13 + __builtin_ffs(dramsize >> 20) - 1);
*(vu_long *)MPC5XXX_SDRAM_CS1CFG = dramsize; /* disabled */
#elif defined(CONFIG_MGT5100)
*(vu_long *)MPC5XXX_SDRAM_STOP = ((dramsize - 1) >> 15);
#endif
#else #else
#ifdef CONFIG_MGT5100 #ifdef CONFIG_MGT5100
*(vu_long *)MPC5XXX_ADDECR |= (1 << 22); /* Enable SDRAM */ *(vu_long *)MPC5XXX_ADDECR |= (1 << 22); /* Enable SDRAM */
#endif #endif
#endif #endif
/* return total ram size */ /* return total ram size */
#if defined(CONFIG_MGT5100) return dramsize;
return (64 * 1024 * 1024);
#elif defined(CONFIG_MPC5200)
return (32 * 1024 * 1024);
#endif
} }
int checkboard (void) int checkboard (void)

11
board/tqm8xx/flash.c
View File

@ -116,14 +116,15 @@ unsigned long flash_init (void)
#ifdef CFG_ENV_IS_IN_FLASH #ifdef CFG_ENV_IS_IN_FLASH
/* ENV protection ON by default */ /* ENV protection ON by default */
debug ("Protect %senvironment: %08lx ... %08lx\n",
# ifdef CFG_ENV_ADDR_REDUND # ifdef CFG_ENV_ADDR_REDUND
"primary ", debug ("Protect primary environment: %08lx ... %08lx\n",
# else
"",
# endif
(ulong)CFG_ENV_ADDR, (ulong)CFG_ENV_ADDR,
(ulong)CFG_ENV_ADDR + CFG_ENV_SECT_SIZE - 1); (ulong)CFG_ENV_ADDR + CFG_ENV_SECT_SIZE - 1);
# else
debug ("Protect environment: %08lx ... %08lx\n",
(ulong)CFG_ENV_ADDR,
(ulong)CFG_ENV_ADDR + CFG_ENV_SECT_SIZE - 1);
# endif
flash_protect(FLAG_PROTECT_SET, flash_protect(FLAG_PROTECT_SET,
CFG_ENV_ADDR, CFG_ENV_ADDR,

3
cpu/mpc5xxx/pci_mpc5200.c
View File

@ -51,9 +51,6 @@ static int mpc5200_read_config_dword(struct pci_controller *hose,
*value = in_le32((volatile u32 *)CONFIG_PCI_IO_PHYS); *value = in_le32((volatile u32 *)CONFIG_PCI_IO_PHYS);
eieio(); eieio();
*(volatile u32 *)MPC5XXX_PCI_CAR = 0; *(volatile u32 *)MPC5XXX_PCI_CAR = 0;
/* skip MPC5200 */
if (offset == 0 && *value == 0x58031057)
*value = 0xffffffff;
return 0; return 0;
} }

2
cpu/mpc5xxx/start.S
View File

@ -103,7 +103,7 @@ boot_cold:
boot_warm: boot_warm:
mfmsr r5 /* save msr contents */ mfmsr r5 /* save msr contents */
#if defined(CFG_DEFAULT_MBAR) #if defined(CFG_DEFAULT_MBAR) && !defined(CFG_RAMBOOT)
lis r3, CFG_MBAR@h lis r3, CFG_MBAR@h
ori r3, r3, CFG_MBAR@l ori r3, r3, CFG_MBAR@l
#if defined(CONFIG_MPC5200) #if defined(CONFIG_MPC5200)

14
doc/README.INCA-IP
View File

@ -41,4 +41,18 @@ to install a U-Boot image into flash.
go 0xb0000000 go 0xb0000000
Ethernet autonegotiation needs some time to complete. Instead of
delaying the boot process in all cases, we just start the
autonegotiation process when U-Boot comes up and that is all. Most
likely, it will complete by the time the network transfer is
attempted for the first time. In the worst case, if a transfer is
attempted before the autonegotiation is complete, just a single
packet would be lost resulting in a single timeout error, and then
the transfer would proceed normally. So the time that we would have
lost unconditionally waiting for the autonegotiation to complete, we
have to wait only if the file transfer is started immediately after
reset. We've verified that this works for all the clock
configurations.
(C) 2003 Wolfgang Denk (C) 2003 Wolfgang Denk

176
drivers/inca-ip_sw.c
View File

@ -70,10 +70,8 @@
typedef struct typedef struct
{ {
union union {
{ struct {
struct
{
volatile u32 HOLD :1; volatile u32 HOLD :1;
volatile u32 ICpt :1; volatile u32 ICpt :1;
volatile u32 IEop :1; volatile u32 IEop :1;
@ -89,10 +87,8 @@ typedef struct
volatile u32 RxDataPtr; volatile u32 RxDataPtr;
union union {
{ struct {
struct
{
volatile u32 C :1; volatile u32 C :1;
volatile u32 Sop :1; volatile u32 Sop :1;
volatile u32 Eop :1; volatile u32 Eop :1;
@ -108,10 +104,8 @@ typedef struct
typedef struct typedef struct
{ {
union union {
{ struct {
struct
{
volatile u32 HOLD :1; volatile u32 HOLD :1;
volatile u32 Eop :1; volatile u32 Eop :1;
volatile u32 Sop :1; volatile u32 Sop :1;
@ -159,8 +153,7 @@ int inca_switch_initialize(bd_t * bis)
printf("Entered inca_switch_initialize()\n"); printf("Entered inca_switch_initialize()\n");
#endif #endif
if (!(dev = (struct eth_device *) malloc (sizeof *dev))) if (!(dev = (struct eth_device *) malloc (sizeof *dev))) {
{
printf("Failed to allocate memory\n"); printf("Failed to allocate memory\n");
return 0; return 0;
} }
@ -229,15 +222,12 @@ static int inca_switch_init(struct eth_device *dev, bd_t * bis)
/* Check if it is the last descriptor. /* Check if it is the last descriptor.
*/ */
if (i == (NUM_RX_DESC - 1)) if (i == (NUM_RX_DESC - 1)) {
{
/* Let the last descriptor point to the first /* Let the last descriptor point to the first
* one. * one.
*/ */
rx_desc->nextRxDescPtr = KSEG1ADDR((u32)rx_ring); rx_desc->nextRxDescPtr = KSEG1ADDR((u32)rx_ring);
} } else {
else
{
/* Set the address of the next descriptor. /* Set the address of the next descriptor.
*/ */
rx_desc->nextRxDescPtr = (u32)KSEG1ADDR(&rx_ring[i+1]); rx_desc->nextRxDescPtr = (u32)KSEG1ADDR(&rx_ring[i+1]);
@ -251,8 +241,7 @@ static int inca_switch_init(struct eth_device *dev, bd_t * bis)
printf("tx_ring = 0x%08X 0x%08X\n", (u32)tx_ring, (u32)&tx_ring[0]); printf("tx_ring = 0x%08X 0x%08X\n", (u32)tx_ring, (u32)&tx_ring[0]);
#endif #endif
for (i = 0; i < NUM_TX_DESC; i++) for (i = 0; i < NUM_TX_DESC; i++) {
{
inca_tx_descriptor_t * tx_desc = KSEG1ADDR(&tx_ring[i]); inca_tx_descriptor_t * tx_desc = KSEG1ADDR(&tx_ring[i]);
memset(tx_desc, 0, sizeof(tx_ring[i])); memset(tx_desc, 0, sizeof(tx_ring[i]));
@ -263,15 +252,12 @@ static int inca_switch_init(struct eth_device *dev, bd_t * bis)
/* Check if it is the last descriptor. /* Check if it is the last descriptor.
*/ */
if (i == (NUM_TX_DESC - 1)) if (i == (NUM_TX_DESC - 1)) {
{
/* Let the last descriptor point to the /* Let the last descriptor point to the
* first one. * first one.
*/ */
tx_desc->nextTxDescPtr = KSEG1ADDR((u32)tx_ring); tx_desc->nextTxDescPtr = KSEG1ADDR((u32)tx_ring);
} } else {
else
{
/* Set the address of the next descriptor. /* Set the address of the next descriptor.
*/ */
tx_desc->nextTxDescPtr = (u32)KSEG1ADDR(&tx_ring[i+1]); tx_desc->nextTxDescPtr = (u32)KSEG1ADDR(&tx_ring[i+1]);
@ -315,9 +301,9 @@ static int inca_switch_init(struct eth_device *dev, bd_t * bis)
#endif #endif
/* enable spanning tree forwarding, enable the CPU port */ /* enable spanning tree forwarding, enable the CPU port */
/* ST_PT: /* ST_PT:
CPS (CPU port status) 0x3 (forwarding) * CPS (CPU port status) 0x3 (forwarding)
LPS (LAN port status) 0x3 (forwarding) * LPS (LAN port status) 0x3 (forwarding)
PPS (PC port status) 0x3 (forwarding) * PPS (PC port status) 0x3 (forwarding)
*/ */
SW_WRITE_REG(INCA_IP_Switch_ST_PT,0x3f); SW_WRITE_REG(INCA_IP_Switch_ST_PT,0x3f);
@ -342,23 +328,19 @@ static int inca_switch_send(struct eth_device *dev, volatile void *packet,
printf("Entered inca_switch_send()\n"); printf("Entered inca_switch_send()\n");
#endif #endif
if (length <= 0) if (length <= 0) {
{
printf ("%s: bad packet size: %d\n", dev->name, length); printf ("%s: bad packet size: %d\n", dev->name, length);
goto Done; goto Done;
} }
for(i = 0; tx_desc->C == 0; i++) for(i = 0; tx_desc->C == 0; i++) {
{ if (i >= TOUT_LOOP) {
if (i >= TOUT_LOOP)
{
printf("%s: tx error buffer not ready\n", dev->name); printf("%s: tx error buffer not ready\n", dev->name);
goto Done; goto Done;
} }
} }
if (tx_old_hold >= 0) if (tx_old_hold >= 0) {
{
KSEG1ADDR(&tx_ring[tx_old_hold])->params.field.HOLD = 1; KSEG1ADDR(&tx_ring[tx_old_hold])->params.field.HOLD = 1;
} }
tx_old_hold = tx_hold; tx_old_hold = tx_hold;
@ -376,13 +358,10 @@ static int inca_switch_send(struct eth_device *dev, volatile void *packet,
tx_new = (tx_new + 1) % NUM_TX_DESC; tx_new = (tx_new + 1) % NUM_TX_DESC;
if (! initialized) if (! initialized) {
{
command = INCA_IP_DMA_DMA_TXCCR0_INIT; command = INCA_IP_DMA_DMA_TXCCR0_INIT;
initialized = 1; initialized = 1;
} } else {
else
{
command = INCA_IP_DMA_DMA_TXCCR0_HR; command = INCA_IP_DMA_DMA_TXCCR0_HR;
} }
@ -394,10 +373,8 @@ static int inca_switch_send(struct eth_device *dev, volatile void *packet,
DMA_WRITE_REG(INCA_IP_DMA_DMA_TXCCR0, regValue); DMA_WRITE_REG(INCA_IP_DMA_DMA_TXCCR0, regValue);
#if 1 #if 1
for(i = 0; KSEG1ADDR(&tx_ring[tx_hold])->C == 0; i++) for(i = 0; KSEG1ADDR(&tx_ring[tx_hold])->C == 0; i++) {
{ if (i >= TOUT_LOOP) {
if (i >= TOUT_LOOP)
{
printf("%s: tx buffer not ready\n", dev->name); printf("%s: tx buffer not ready\n", dev->name);
goto Done; goto Done;
} }
@ -421,12 +398,10 @@ static int inca_switch_recv(struct eth_device *dev)
printf("Entered inca_switch_recv()\n"); printf("Entered inca_switch_recv()\n");
#endif #endif
for (;;) for (;;) {
{
rx_desc = KSEG1ADDR(&rx_ring[rx_new]); rx_desc = KSEG1ADDR(&rx_ring[rx_new]);
if (rx_desc->status.field.C == 0) if (rx_desc->status.field.C == 0) {
{
break; break;
} }
@ -434,8 +409,7 @@ static int inca_switch_recv(struct eth_device *dev)
rx_ring[rx_new].params.field.HOLD = 1; rx_ring[rx_new].params.field.HOLD = 1;
#endif #endif
if (! rx_desc->status.field.Eop) if (! rx_desc->status.field.Eop) {
{
printf("Partly received packet!!!\n"); printf("Partly received packet!!!\n");
break; break;
} }
@ -454,16 +428,13 @@ static int inca_switch_recv(struct eth_device *dev)
} }
#endif #endif
if (length) if (length) {
{
#if 0 #if 0
printf("Received %d bytes\n", length); printf("Received %d bytes\n", length);
#endif #endif
NetReceive((void*)KSEG1ADDR(NetRxPackets[rx_new]), NetReceive((void*)KSEG1ADDR(NetRxPackets[rx_new]),
length - 4); length - 4);
} } else {
else
{
#if 1 #if 1
printf("Zero length!!!\n"); printf("Zero length!!!\n");
#endif #endif
@ -527,63 +498,64 @@ static void inca_init_switch_chip(void)
#if 1 #if 1
/* init MDIO configuration: /* init MDIO configuration:
MDS (Poll speed): 0x01 (4ms) * MDS (Poll speed): 0x01 (4ms)
PHY_LAN_ADDR: 0x06 * PHY_LAN_ADDR: 0x06
PHY_PC_ADDR: 0x05 * PHY_PC_ADDR: 0x05
UEP (Use External PHY): 0x00 (Internal PHY is used) * UEP (Use External PHY): 0x00 (Internal PHY is used)
PS (Port Select): 0x00 (PT/UMM for LAN) * PS (Port Select): 0x00 (PT/UMM for LAN)
PT (PHY Test): 0x00 (no test mode) * PT (PHY Test): 0x00 (no test mode)
UMM (Use MDIO Mode): 0x00 (state machine is disabled) * UMM (Use MDIO Mode): 0x00 (state machine is disabled)
*/ */
SW_WRITE_REG(INCA_IP_Switch_MDIO_CFG, 0x4c50); SW_WRITE_REG(INCA_IP_Switch_MDIO_CFG, 0x4c50);
/* init PHY: /* init PHY:
SL (Auto Neg. Speed for LAN) * SL (Auto Neg. Speed for LAN)
SP (Auto Neg. Speed for PC) * SP (Auto Neg. Speed for PC)
LL (Link Status for LAN) * LL (Link Status for LAN)
LP (Link Status for PC) * LP (Link Status for PC)
DL (Duplex Status for LAN) * DL (Duplex Status for LAN)
DP (Duplex Status for PC) * DP (Duplex Status for PC)
PL (Auto Neg. Pause Status for LAN) * PL (Auto Neg. Pause Status for LAN)
PP (Auto Neg. Pause Status for PC) * PP (Auto Neg. Pause Status for PC)
*/ */
SW_WRITE_REG (INCA_IP_Switch_EPHY, 0xff); SW_WRITE_REG (INCA_IP_Switch_EPHY, 0xff);
/* MDIO_ACC: /* MDIO_ACC:
RA (Request/Ack) 0x01 (Request) * RA (Request/Ack) 0x01 (Request)
RW (Read/Write) 0x01 (Write) * RW (Read/Write) 0x01 (Write)
PHY_ADDR 0x05 (PC) * PHY_ADDR 0x05 (PC)
REG_ADDR 0x00 (PHY_BCR: basic control register) * REG_ADDR 0x00 (PHY_BCR: basic control register)
PHY_DATA 0x8000 * PHY_DATA 0x8000
Reset - software reset * Reset - software reset
LB (loop back) - normal * LB (loop back) - normal
SS (speed select) - 10 Mbit/s * SS (speed select) - 10 Mbit/s
ANE (auto neg. enable) - disable * ANE (auto neg. enable) - enable
PD (power down) - normal * PD (power down) - normal
ISO (isolate) - normal * ISO (isolate) - normal
RAN (restart auto neg.) - normal * RAN (restart auto neg.) - normal
DM (duplex mode) - half duplex * DM (duplex mode) - half duplex
CT (collision test) - enable * CT (collision test) - enable
*/ */
SW_WRITE_REG(INCA_IP_Switch_MDIO_ACC, 0xc0a08000); SW_WRITE_REG(INCA_IP_Switch_MDIO_ACC, 0xc0a09000);
/* MDIO_ACC: /* MDIO_ACC:
RA (Request/Ack) 0x01 (Request) * RA (Request/Ack) 0x01 (Request)
RW (Read/Write) 0x01 (Write) * RW (Read/Write) 0x01 (Write)
PHY_ADDR 0x06 (LAN) * PHY_ADDR 0x06 (LAN)
REG_ADDR 0x00 (PHY_BCR: basic control register) * REG_ADDR 0x00 (PHY_BCR: basic control register)
PHY_DATA 0x8000 * PHY_DATA 0x8000
Reset - software reset * Reset - software reset
LB (loop back) - normal * LB (loop back) - normal
SS (speed select) - 10 Mbit/s * SS (speed select) - 10 Mbit/s
ANE (auto neg. enable) - disable * ANE (auto neg. enable) - enable
PD (power down) - normal * PD (power down) - normal
ISO (isolate) - normal * ISO (isolate) - normal
RAN (restart auto neg.) - normal * RAN (restart auto neg.) - normal
DM (duplex mode) - half duplex * DM (duplex mode) - half duplex
CT (collision test) - enable * CT (collision test) - enable
*/ */
SW_WRITE_REG(INCA_IP_Switch_MDIO_ACC, 0xc0c08000); SW_WRITE_REG(INCA_IP_Switch_MDIO_ACC, 0xc0c09000);
#endif #endif
/* Make sure the CPU port is disabled for now. We /* Make sure the CPU port is disabled for now. We

7
drivers/pci_auto.c
View File

@ -323,6 +323,13 @@ int pciauto_config_device(struct pci_controller *hose, pci_dev_t dev)
hose->current_busno++; hose->current_busno++;
break; break;
#ifdef CONFIG_MPC5200
case PCI_CLASS_BRIDGE_OTHER:
DEBUGF("PCI Autoconfig: Skipping bridge device %d\n",
PCI_DEV(dev));
break;
#endif
default: default:
pciauto_setup_device(hose, dev, 6, hose->pci_mem, hose->pci_io); pciauto_setup_device(hose, dev, 6, hose->pci_mem, hose->pci_io);
break; break;

3
include/configs/IceCube.h
View File

@ -131,6 +131,9 @@
*/ */
#define CFG_MBAR 0xf0000000 #define CFG_MBAR 0xf0000000
#define CFG_SDRAM_BASE 0x00000000 #define CFG_SDRAM_BASE 0x00000000
#ifdef CONFIG_MPC5200
#define CFG_DEFAULT_MBAR 0x80000000
#endif
/* Use SRAM until RAM will be available */ /* Use SRAM until RAM will be available */
#define CFG_INIT_RAM_ADDR MPC5XXX_SRAM #define CFG_INIT_RAM_ADDR MPC5XXX_SRAM

2
include/configs/incaip.h
View File

@ -31,8 +31,10 @@
#define CONFIG_MIPS32 1 /* MIPS 4Kc CPU core */ #define CONFIG_MIPS32 1 /* MIPS 4Kc CPU core */
#define CONFIG_INCA_IP 1 /* on a INCA-IP Board */ #define CONFIG_INCA_IP 1 /* on a INCA-IP Board */
#ifndef CPU_CLOCK_RATE
/* allowed values: 100000000, 133000000, and 150000000 */ /* allowed values: 100000000, 133000000, and 150000000 */
#define CPU_CLOCK_RATE 133000000 /* 133 MHz clock for the MIPS core */ #define CPU_CLOCK_RATE 133000000 /* 133 MHz clock for the MIPS core */
#endif
#if CPU_CLOCK_RATE == 100000000 #if CPU_CLOCK_RATE == 100000000
#define INFINEON_EBU_BOOTCFG 0x20C4 /* CMULT = 4 for 100 MHz */ #define INFINEON_EBU_BOOTCFG 0x20C4 /* CMULT = 4 for 100 MHz */

2
include/version.h
View File

@ -24,6 +24,6 @@
#ifndef __VERSION_H__ #ifndef __VERSION_H__
#define __VERSION_H__ #define __VERSION_H__
#define U_BOOT_VERSION "U-Boot 0.4.5" #define U_BOOT_VERSION "U-Boot 0.4.6"
#endif /* __VERSION_H__ */ #endif /* __VERSION_H__ */

1
lib_generic/crc32.c
View File

@ -178,7 +178,6 @@ uLong ZEXPORT crc32(crc, buf, len)
*/ */
uLong ZEXPORT crc32_no_comp(uLong crc, const Bytef *buf, uInt len) uLong ZEXPORT crc32_no_comp(uLong crc, const Bytef *buf, uInt len)
{ {
if (buf == Z_NULL) return 0L;
#ifdef DYNAMIC_CRC_TABLE #ifdef DYNAMIC_CRC_TABLE
if (crc_table_empty) if (crc_table_empty)
make_crc_table(); make_crc_table();

4
lib_mips/time.c
View File

@ -75,9 +75,7 @@ void udelay (unsigned long usec)
ulong tmo; ulong tmo;
ulong start = get_timer(0); ulong start = get_timer(0);
tmo = usec * CFG_HZ / 1000; tmo = usec * (CFG_HZ / 1000000);
tmo /= 1000;
while ((ulong)((mips_count_get() - start)) < tmo) while ((ulong)((mips_count_get() - start)) < tmo)
/*NOP*/; /*NOP*/;
} }

8
net/net.c
View File

@ -125,7 +125,8 @@ volatile uchar *NetRxPackets[PKTBUFSRX]; /* Receive packets */
static rxhand_f *packetHandler; /* Current RX packet handler */ static rxhand_f *packetHandler; /* Current RX packet handler */
static thand_f *timeHandler; /* Current timeout handler */ static thand_f *timeHandler; /* Current timeout handler */
static ulong timeValue; /* Current timeout value */ static ulong timeStart; /* Time base value */
static ulong timeDelta; /* Current timeout value */
volatile uchar *NetTxPacket = 0; /* THE transmit packet */ volatile uchar *NetTxPacket = 0; /* THE transmit packet */
static int net_check_prereq (proto_t protocol); static int net_check_prereq (proto_t protocol);
@ -391,7 +392,7 @@ restart:
* Check for a timeout, and run the timeout handler * Check for a timeout, and run the timeout handler
* if we have one. * if we have one.
*/ */
if (timeHandler && (get_timer(0) > timeValue)) { if (timeHandler && ((get_timer(0) - timeStart) > timeDelta)) {
thand_f *x; thand_f *x;
x = timeHandler; x = timeHandler;
@ -491,7 +492,8 @@ NetSetTimeout(int iv, thand_f * f)
timeHandler = (thand_f *)0; timeHandler = (thand_f *)0;
} else { } else {
timeHandler = f; timeHandler = f;
timeValue = get_timer(0) + iv; timeStart = get_timer(0);
timeDelta = iv;
} }
} }

2
net/tftp.c
View File

@ -240,7 +240,7 @@ TftpHandler (uchar * pkt, unsigned dest, unsigned src, unsigned len)
static void static void
TftpTimeout (void) TftpTimeout (void)
{ {
if (++TftpTimeoutCount >= TIMEOUT_COUNT) { if (++TftpTimeoutCount > TIMEOUT_COUNT) {
puts ("\nRetry count exceeded; starting again\n"); puts ("\nRetry count exceeded; starting again\n");
NetStartAgain (); NetStartAgain ();
} else { } else {

5
tools/Makefile
View File

@ -152,6 +152,9 @@ inca-swap-bytes.o: inca-swap-bytes.c
$(CC) -g $(CFLAGS) -c $< $(CC) -g $(CFLAGS) -c $<
subdirs: subdirs:
ifeq ($(TOOLSUBDIRS),)
@:
else
@for dir in $(TOOLSUBDIRS) ; do \ @for dir in $(TOOLSUBDIRS) ; do \
$(MAKE) \ $(MAKE) \
HOSTOS=$(HOSTOS) \ HOSTOS=$(HOSTOS) \
@ -160,6 +163,8 @@ subdirs:
HOST_LDFLAGS="$(HOST_LDFLAGS)" \ HOST_LDFLAGS="$(HOST_LDFLAGS)" \
-C $$dir || exit 1 ; \ -C $$dir || exit 1 ; \
done done
endif
environment.c: environment.c:
ln -s ../common/environment.c environment.c ln -s ../common/environment.c environment.c