TQM8260: environment in flash instead EEPROM, baudrate 115k

[oweals/u-boot.git] / net / eth.c

diff --git a/net/eth.c b/net/eth.c
index 053179e4314bdb9f9f1f222924a84af508ed9dc2..ccd871a67c320daec528345c36fa6471570ef5c0 100644 (file)
--- a/net/eth.c
+++ b/net/eth.c
@@ -40,14 +40,10 @@ int cpu_eth_init(bd_t *bis) __attribute((weak, alias("__def_eth_init")));
 int board_eth_init(bd_t *bis) __attribute((weak, alias("__def_eth_init")));
 
 extern int au1x00_enet_initialize(bd_t*);
-extern int dc21x4x_initialize(bd_t*);
-extern int e1000_initialize(bd_t*);
-extern int eepro100_initialize(bd_t*);
 extern int fec_initialize(bd_t*);
 extern int mpc8220_fec_initialize(bd_t*);
 extern int mv6436x_eth_initialize(bd_t *);
 extern int mv6446x_eth_initialize(bd_t *);
-extern int plb2800_eth_initialize(bd_t*);
 extern int ppc_4xx_eth_initialize(bd_t *);
 extern int scc_initialize(bd_t*);
 extern int npe_initialize(bd_t *);
@@ -166,9 +162,6 @@ int eth_initialize(bd_t *bis)
 #if defined(CONFIG_4xx) && !defined(CONFIG_IOP480) && !defined(CONFIG_AP1000)
        ppc_4xx_eth_initialize(bis);
 #endif
-#ifdef CONFIG_PLB2800_ETHER
-       plb2800_eth_initialize(bis);
-#endif
 #ifdef SCC_ENET
        scc_initialize(bis);
 #endif
@@ -187,6 +180,12 @@ int eth_initialize(bd_t *bis)
 #if defined(CONFIG_UEC_ETH4)
        uec_initialize(3);
 #endif
+#if defined(CONFIG_UEC_ETH5)
+       uec_initialize(4);
+#endif
+#if defined(CONFIG_UEC_ETH6)
+       uec_initialize(5);
+#endif
 
 #if defined(FEC_ENET) || defined(CONFIG_ETHER_ON_FCC)
        fec_initialize(bis);
@@ -196,15 +195,6 @@ int eth_initialize(bd_t *bis)
 #endif
 #if defined(CONFIG_IXP4XX_NPE)
        npe_initialize(bis);
-#endif
-#ifdef CONFIG_E1000
-       e1000_initialize(bis);
-#endif
-#ifdef CONFIG_EEPRO100
-       eepro100_initialize(bis);
-#endif
-#ifdef CONFIG_TULIP
-       dc21x4x_initialize(bis);
 #endif
        if (!eth_devices) {
                puts ("No ethernet found.\n");