diff options
author | Michal Simek <monstr@monstr.eu> | 2007-09-24 00:04:22 +0200 |
---|---|---|
committer | Michal Simek <monstr@monstr.eu> | 2007-09-24 00:04:22 +0200 |
commit | 6b6f287a33ae8c340f97fb08ed95b6687e2baa4b (patch) | |
tree | 57d0aa201f36c6dd5a43efd23a0ee2ded95440ba /cpu/mpc512x/fec.c | |
parent | d45963854eff39d575124d859419bb4953ce2c87 (diff) | |
parent | 66dcad3a9a53e0766d90e0084123bd8529522fb0 (diff) | |
download | u-boot-imx-6b6f287a33ae8c340f97fb08ed95b6687e2baa4b.zip u-boot-imx-6b6f287a33ae8c340f97fb08ed95b6687e2baa4b.tar.gz u-boot-imx-6b6f287a33ae8c340f97fb08ed95b6687e2baa4b.tar.bz2 |
Merge ../u-boot
Diffstat (limited to 'cpu/mpc512x/fec.c')
-rw-r--r-- | cpu/mpc512x/fec.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cpu/mpc512x/fec.c b/cpu/mpc512x/fec.c index 8104576..675b7a2 100644 --- a/cpu/mpc512x/fec.c +++ b/cpu/mpc512x/fec.c @@ -32,7 +32,7 @@ int fec512x_miiphy_read(char *devname, uint8 phyAddr, uint8 regAddr, uint16 * re int fec512x_miiphy_write(char *devname, uint8 phyAddr, uint8 regAddr, uint16 data); int mpc512x_fec_init_phy(struct eth_device *dev, bd_t * bis); -static uchar rx_buff[FEC_MAX_PKT_SIZE]; +static uchar rx_buff[FEC_BUFFER_SIZE]; static int rx_buff_idx = 0; /********************************************************************/ @@ -237,8 +237,8 @@ static int mpc512x_fec_init (struct eth_device *dev, bd_t * bis) /* Set Opcode/Pause Duration Register */ fec->eth->op_pause = 0x00010020; - /* Frame length=1518; MII mode */ - fec->eth->r_cntrl = 0x05ee0024; + /* Frame length=1522; MII mode */ + fec->eth->r_cntrl = (FEC_MAX_FRAME_LEN << 16) | 0x24; /* Half-duplex, heartbeat disabled */ fec->eth->x_cntrl = 0x00000000; @@ -248,7 +248,7 @@ static int mpc512x_fec_init (struct eth_device *dev, bd_t * bis) /* Setup recv fifo start and buff size */ fec->eth->r_fstart = 0x500; - fec->eth->r_buff_size = 0x5e0; + fec->eth->r_buff_size = FEC_BUFFER_SIZE; /* Setup BD base addresses */ fec->eth->r_des_start = (uint32)fec->bdBase->rbd; |