summaryrefslogtreecommitdiff
path: root/cpu
diff options
context:
space:
mode:
authorwdenk <wdenk>2004-06-17 18:50:45 +0000
committerwdenk <wdenk>2004-06-17 18:50:45 +0000
commit46a414dc12c7809ac3c3e82b6198a1f435d7489f (patch)
tree1f72a6b74f5f0447ea5369194f7325b1f51092b1 /cpu
parentf832d8a1432da791b94b820ccf2c7864708c5631 (diff)
downloadu-boot-imx-46a414dc12c7809ac3c3e82b6198a1f435d7489f.zip
u-boot-imx-46a414dc12c7809ac3c3e82b6198a1f435d7489f.tar.gz
u-boot-imx-46a414dc12c7809ac3c3e82b6198a1f435d7489f.tar.bz2
* Fix flash parameters passed to Linux for PPChameleon board
* Remove eth_init() from lib_arm/board.c; it's done in net.net.c.
Diffstat (limited to 'cpu')
-rw-r--r--cpu/ppc4xx/405gp_enet.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/cpu/ppc4xx/405gp_enet.c b/cpu/ppc4xx/405gp_enet.c
index da45558..572af62 100644
--- a/cpu/ppc4xx/405gp_enet.c
+++ b/cpu/ppc4xx/405gp_enet.c
@@ -414,6 +414,7 @@ static int ppc_4xx_eth_init (struct eth_device *dev, bd_t * bis)
out32 (EMAC_IAL + hw_p->hw_addr, reg);
switch (devnum) {
+#if defined(CONFIG_NET_MULTI)
case 1:
/* setup MAL tx & rx channel pointers */
/* For 405EP, the EMAC1 tx channel 0 is MAL tx channel 2 */
@@ -422,6 +423,7 @@ static int ppc_4xx_eth_init (struct eth_device *dev, bd_t * bis)
/* set RX buffer size */
mtdcr (malrcbs1, ENET_MAX_MTU_ALIGNED / 16);
break;
+#endif
case 0:
default:
/* setup MAL tx & rx channel pointers */