diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-05-04 22:57:37 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-05-04 22:57:37 +0200 |
| commit | 679ec154620eaf377143ba429124abc91abed0eb (patch) | |
| tree | f61ddb23bb663722a42728f641663ff0f9fd857d /include | |
| parent | 900a1fe8c8c7acda1d8903af02c2d0d993b770d8 (diff) | |
| parent | 4324dc72df5879e5b614c4a3f326884723ede9b7 (diff) | |
| download | talos-obmc-uboot-679ec154620eaf377143ba429124abc91abed0eb.tar.gz talos-obmc-uboot-679ec154620eaf377143ba429124abc91abed0eb.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-net
Diffstat (limited to 'include')
| -rw-r--r-- | include/net.h | 1 | ||||
| -rw-r--r-- | include/netdev.h | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/include/net.h b/include/net.h index 3f6a5d1497..a180881dc7 100644 --- a/include/net.h +++ b/include/net.h @@ -105,6 +105,7 @@ struct eth_device { #ifdef CONFIG_MCAST_TFTP int (*mcast) (struct eth_device*, u32 ip, u8 set); #endif + int (*write_hwaddr) (struct eth_device*); struct eth_device *next; void *priv; }; diff --git a/include/netdev.h b/include/netdev.h index 1dd80f0593..882642a2c4 100644 --- a/include/netdev.h +++ b/include/netdev.h @@ -41,6 +41,8 @@ int board_eth_init(bd_t *bis); 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 au1x00_enet_initialize(bd_t*); int at91emac_register(bd_t *bis, unsigned long iobase); int bfin_EMAC_initialize(bd_t *bis); @@ -51,6 +53,7 @@ int dnet_eth_initialize(int id, void *regs, unsigned int phy_addr); int e1000_initialize(bd_t *bis); int eepro100_initialize(bd_t *bis); int ep93xx_eth_initialize(u8 dev_num, int base_addr); +int ethoc_initialize(u8 dev_num, int base_addr); int eth_3com_initialize (bd_t * bis); int fec_initialize (bd_t *bis); int fecmxc_initialize (bd_t *bis); |
