diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-07-09 23:22:54 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-07-09 23:22:54 +0200 |
| commit | 9692cab76f7b7891f71c8a9b189465cd3bd68ef0 (patch) | |
| tree | d84348280c2993329787ef7881ada85241d2f61b /net/eth.c | |
| parent | 2caea1ebee1fb20e1b229f1f821225829fb87f0e (diff) | |
| parent | 63676841ca2d603b13765f3f7b72ff1a61c23f90 (diff) | |
| download | talos-obmc-uboot-9692cab76f7b7891f71c8a9b189465cd3bd68ef0.tar.gz talos-obmc-uboot-9692cab76f7b7891f71c8a9b189465cd3bd68ef0.zip | |
Merge branch 'master' of git://www.denx.de/git/u-boot-net
Diffstat (limited to 'net/eth.c')
| -rw-r--r-- | net/eth.c | 32 |
1 files changed, 15 insertions, 17 deletions
@@ -28,6 +28,17 @@ #if defined(CONFIG_CMD_NET) && defined(CONFIG_NET_MULTI) +/* + * CPU and board-specific Ethernet initializations. Aliased function + * signals caller to move on + */ +static int __def_eth_init(bd_t *bis) +{ + return -1; +} +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"))); + #ifdef CFG_GT_6426x extern int gt6426x_eth_initialize(bd_t *bis); #endif @@ -55,7 +66,6 @@ extern int scc_initialize(bd_t*); extern int skge_initialize(bd_t*); extern int tsi108_eth_initialize(bd_t*); extern int uli526x_initialize(bd_t *); -extern int tsec_initialize(bd_t*, int, char *); extern int npe_initialize(bd_t *); extern int uec_initialize(int); extern int bfin_EMAC_initialize(bd_t *); @@ -165,6 +175,10 @@ int eth_initialize(bd_t *bis) #if defined(CONFIG_MII) || defined(CONFIG_CMD_MII) miiphy_init(); #endif + /* Try board-specific initialization first. If it fails or isn't + * present, try the cpu-specific initialization */ + if (board_eth_init(bis) < 0) + cpu_eth_init(bis); #if defined(CONFIG_DB64360) || defined(CONFIG_CPCI750) mv6436x_eth_initialize(bis); @@ -196,22 +210,6 @@ int eth_initialize(bd_t *bis) #if defined(CONFIG_SK98) skge_initialize(bis); #endif -#if defined(CONFIG_TSEC1) - tsec_initialize(bis, 0, CONFIG_TSEC1_NAME); -#endif -#if defined(CONFIG_TSEC2) - tsec_initialize(bis, 1, CONFIG_TSEC2_NAME); -#endif -#if defined(CONFIG_MPC85XX_FEC) - tsec_initialize(bis, 2, CONFIG_MPC85XX_FEC_NAME); -#else -# if defined(CONFIG_TSEC3) - tsec_initialize(bis, 2, CONFIG_TSEC3_NAME); -# endif -# if defined(CONFIG_TSEC4) - tsec_initialize(bis, 3, CONFIG_TSEC4_NAME); -# endif -#endif #if defined(CONFIG_UEC_ETH1) uec_initialize(0); #endif |
