summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorStefan Roese <sr@denx.de>2005-08-16 18:18:00 +0200
committerStefan Roese <sr@denx.de>2005-08-16 18:18:00 +0200
commitd6c61aabc49c22a5c040f046fdc04dc478ed071f (patch)
treeea793de701f14cfa4154786c8a240d1d24964ad4 /net
parent98128f389cc318dbd1d597cf8d2d09902cddcb4b (diff)
downloadu-boot-imx-d6c61aabc49c22a5c040f046fdc04dc478ed071f.zip
u-boot-imx-d6c61aabc49c22a5c040f046fdc04dc478ed071f.tar.gz
u-boot-imx-d6c61aabc49c22a5c040f046fdc04dc478ed071f.tar.bz2
Merged 405gp_enet.c and 440gx_enet.c to generic 4xx_enet.c
now handling all 4xx cpu's. Patch by Stefan Roese, 16 Aug 2005
Diffstat (limited to 'net')
-rw-r--r--net/eth.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/net/eth.c b/net/eth.c
index 61862aa..68dfcae 100644
--- a/net/eth.c
+++ b/net/eth.c
@@ -47,7 +47,6 @@ extern int ns8382x_initialize(bd_t*);
extern int pcnet_initialize(bd_t*);
extern int plb2800_eth_initialize(bd_t*);
extern int ppc_4xx_eth_initialize(bd_t *);
-extern int ppc_440x_eth_initialize(bd_t *);
extern int rtl8139_initialize(bd_t*);
extern int rtl8169_initialize(bd_t*);
extern int scc_initialize(bd_t*);
@@ -126,13 +125,9 @@ int eth_initialize(bd_t *bis)
#ifdef CONFIG_DB64460
mv6446x_eth_initialize(bis);
#endif
-#if defined(CONFIG_405GP) || defined(CONFIG_405EP) || \
- ( defined(CONFIG_440) && !defined(CONFIG_NET_MULTI) )
+#if defined(CONFIG_4xx) && !defined(CONFIG_IOP480)
ppc_4xx_eth_initialize(bis);
#endif
-#if defined(CONFIG_440) && defined(CONFIG_NET_MULTI)
- ppc_440x_eth_initialize(bis);
-#endif
#ifdef CONFIG_INCA_IP_SWITCH
inca_switch_initialize(bis);
#endif