projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sunxi: usb: USB_MUSB_SUNXI move to musb-new Kconfig
[oweals/u-boot.git]
/
drivers
/
net
/
mpc512x_fec.c
diff --git
a/drivers/net/mpc512x_fec.c
b/drivers/net/mpc512x_fec.c
index f56d940f915adeca9a305376079be12c166a0fc3..22ea114f01bd7674bcf9a948bfb06b7e5af85945 100644
(file)
--- a/
drivers/net/mpc512x_fec.c
+++ b/
drivers/net/mpc512x_fec.c
@@
-18,9
+18,6
@@
DECLARE_GLOBAL_DATA_PTR;
#define DEBUG 0
#define DEBUG 0
-#if defined(CONFIG_CMD_NET) && defined(CONFIG_NET_MULTI) && \
- defined(CONFIG_MPC512x_FEC)
-
#if !(defined(CONFIG_MII) || defined(CONFIG_CMD_MII))
#error "CONFIG_MII has to be defined!"
#endif
#if !(defined(CONFIG_MII) || defined(CONFIG_CMD_MII))
#error "CONFIG_MII has to be defined!"
#endif
@@
-307,7
+304,7
@@
int mpc512x_fec_init_phy (struct eth_device *dev, bd_t * bis)
* and do not drop the Preamble.
*/
out_be32(&fec->eth->mii_speed,
* and do not drop the Preamble.
*/
out_be32(&fec->eth->mii_speed,
- (((gd->ips_clk / 1000000) / 5) + 1) << 1);
+ (((gd->
arch.
ips_clk / 1000000) / 5) + 1) << 1);
/*
* Reset PHY, then delay 300ns
/*
* Reset PHY, then delay 300ns
@@
-455,8
+452,8
@@
static void mpc512x_fec_halt (struct eth_device *dev)
/********************************************************************/
/********************************************************************/
-static int mpc512x_fec_send
(struct eth_device *dev, volatile
void *eth_data,
- int data_length)
+static int mpc512x_fec_send
(struct eth_device *dev,
void *eth_data,
+
int data_length)
{
/*
* This routine transmits one frame. This routine only accepts
{
/*
* This routine transmits one frame. This routine only accepts
@@
-594,7
+591,8
@@
static int mpc512x_fec_recv (struct eth_device *dev)
rx_buff_idx = frame_length;
if (pRbd->status & FEC_RBD_LAST) {
rx_buff_idx = frame_length;
if (pRbd->status & FEC_RBD_LAST) {
- NetReceive ((uchar*)rx_buff, frame_length);
+ net_process_received_packet((uchar *)rx_buff,
+ frame_length);
rx_buff_idx = 0;
}
}
rx_buff_idx = 0;
}
}
@@
-755,5
+753,3
@@
int fec512x_miiphy_write(const char *devname, u8 phyAddr, u8 regAddr, u16 data)
return 0;
}
return 0;
}
-
-#endif /* CONFIG_MPC512x_FEC */