diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-10-02 14:53:27 +0200 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-10-02 14:53:27 +0200 |
| commit | f04c53762962280365005c9db12ab561a18f2692 (patch) | |
| tree | 6cd2fa04929473afda1cceaa297cd340792bd326 /drivers/net/fec_mxc.c | |
| parent | 5c8d5b6fc15fc2c52d74c266d9fe6eb5f75cbcb4 (diff) | |
| parent | ce7a7f5e6bda35d7d0972be07b6983552d1a2cb2 (diff) | |
| download | u-boot-f04c53762962280365005c9db12ab561a18f2692.tar.gz u-boot-f04c53762962280365005c9db12ab561a18f2692.tar.xz u-boot-f04c53762962280365005c9db12ab561a18f2692.zip | |
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
Diffstat (limited to 'drivers/net/fec_mxc.c')
| -rw-r--r-- | drivers/net/fec_mxc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/fec_mxc.c b/drivers/net/fec_mxc.c index 690e5724b4..107cd6ecc5 100644 --- a/drivers/net/fec_mxc.c +++ b/drivers/net/fec_mxc.c @@ -453,7 +453,7 @@ static int fec_open(struct eth_device *edev) */ writel(readl(&fec->eth->ecntrl) | FEC_ECNTRL_ETHER_EN, &fec->eth->ecntrl); -#if defined(CONFIG_MX25) || defined(CONFIG_MX53) +#if defined(CONFIG_MX25) || defined(CONFIG_MX53) || defined(CONFIG_MX6SL) udelay(100); /* * setup the MII gasket for RMII mode @@ -794,7 +794,7 @@ static int fec_recv(struct eth_device *dev) uint16_t bd_status; uint32_t addr, size, end; int i; - uchar buff[FEC_MAX_PKT_SIZE] __aligned(ARCH_DMA_MINALIGN); + ALLOC_CACHE_ALIGN_BUFFER(uchar, buff, FEC_MAX_PKT_SIZE); /* * Check if any critical events have happened |