Merge branch 'master' of /home/wd/git/u-boot/custodians

[karo-tx-uboot.git] / include / netdev.h

diff --git a/include/netdev.h b/include/netdev.h
index e979cbd32457beb07afbf8a756befd3f0a8bf311..04d9f75b771d36b422539523285a20520cf9dc8d 100644 (file)
--- a/include/netdev.h
+++ b/include/netdev.h
@@ -42,7 +42,8 @@ int cpu_eth_init(bd_t *bis);
 
 /* Driver initialization prototypes */
 int altera_tse_initialize(u8 dev_num, int mac_base,
-                         int sgdma_rx_base, int sgdma_tx_base);
+                         int sgdma_rx_base, int sgdma_tx_base,
+                         u32 sgdma_desc_base, u32 sgdma_desc_size);
 int at91emac_register(bd_t *bis, unsigned long iobase);
 int au1x00_enet_initialize(bd_t*);
 int ax88180_initialize(bd_t *bis);
@@ -95,7 +96,10 @@ int tsi108_eth_initialize(bd_t *bis);
 int uec_standard_init(bd_t *bis);
 int uli526x_initialize(bd_t *bis);
 int armada100_fec_register(unsigned long base_addr);
-int xilinx_emaclite_initialize (bd_t *bis, int base_addr);
+int xilinx_axiemac_initialize(bd_t *bis, unsigned long base_addr,
+                                                       unsigned long dma_addr);
+int xilinx_emaclite_initialize(bd_t *bis, unsigned long base_addr,
+                                                       int txpp, int rxpp);
 
 /* Boards with PCI network controllers can call this from their board_eth_init()
  * function to initialize whatever's on board.
@@ -186,4 +190,9 @@ struct mv88e61xx_config {
 int mv88e61xx_switch_initialize(struct mv88e61xx_config *swconfig);
 #endif /* CONFIG_MV88E61XX_SWITCH */
 
+/*
+ * Allow FEC to fine-tune MII configuration on boards which require this.
+ */
+int fecmxc_register_mii_postcall(struct eth_device *dev, int (*cb)(int));
+
 #endif /* _NETDEV_H_ */