Merge branch 'master' of git://git.denx.de/u-boot-mpc86xx

[platform/kernel/u-boot.git] / include / netdev.h

diff --git a/include/netdev.h b/include/netdev.h
index 487d319..751f0da 100644 (file)
--- a/include/netdev.h
+++ b/include/netdev.h
@@ -41,8 +41,13 @@ int board_eth_init(bd_t *bis);
 int cpu_eth_init(bd_t *bis);
 
 /* Driver initialization prototypes */
+int au1x00_enet_initialize(bd_t*);
 int bfin_EMAC_initialize(bd_t *bis);
+int dc21x4x_initialize(bd_t *bis);
+int e1000_initialize(bd_t *bis);
+int eepro100_initialize(bd_t *bis);
 int eth_3com_initialize (bd_t * bis);
+int fec_initialize (bd_t *bis);
 int greth_initialize(bd_t *bis);
 void gt6426x_eth_initialize(bd_t *bis);
 int inca_switch_initialize(bd_t *bis);
@@ -50,13 +55,20 @@ int macb_eth_initialize(int id, void *regs, unsigned int phy_addr);
 int mcdmafec_initialize(bd_t *bis);
 int mcffec_initialize(bd_t *bis);
 int mpc512x_fec_initialize(bd_t *bis);
+int mpc5xxx_fec_initialize(bd_t *bis);
+int mpc8220_fec_initialize(bd_t *bis);
 int natsemi_initialize(bd_t *bis);
+int npe_initialize(bd_t *bis);
 int ns8382x_initialize(bd_t *bis);
 int pcnet_initialize(bd_t *bis);
+int plb2800_eth_initialize(bd_t *bis);
+int ppc_4xx_eth_initialize (bd_t *bis);
 int rtl8139_initialize(bd_t *bis);
 int rtl8169_initialize(bd_t *bis);
+int scc_initialize(bd_t *bis);
 int skge_initialize(bd_t *bis);
 int tsi108_eth_initialize(bd_t *bis);
+int uec_initialize(int index);
 int uli526x_initialize(bd_t *bis);
 
 /* Boards with PCI network controllers can call this from their board_eth_init()
@@ -67,6 +79,17 @@ static inline int pci_eth_init(bd_t *bis)
 {
        int num = 0;
 
+#ifdef CONFIG_PCI
+
+#ifdef CONFIG_EEPRO100
+       num += eepro100_initialize(bis);
+#endif
+#ifdef CONFIG_TULIP
+       num += dc21x4x_initialize(bis);
+#endif
+#ifdef CONFIG_E1000
+       num += e1000_initialize(bis);
+#endif
 #ifdef CONFIG_PCNET
        num += pcnet_initialize(bis);
 #endif
@@ -85,8 +108,9 @@ static inline int pci_eth_init(bd_t *bis)
 #if defined(CONFIG_ULI526)
        num += uli526x_initialize(bis);
 #endif
+
+#endif  /* CONFIG_PCI */
        return num;
 }
 
 #endif /* _NETDEV_H_ */
-