diff options
| author | Marek Vasut <marex@denx.de> | 2012-03-02 22:39:32 +0000 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2012-03-06 21:13:26 +0100 |
| commit | 021f6038a233bc6a60edc4adc1819492fddff9ff (patch) | |
| tree | fabe55ab81f61c2fa338a0748fbfc92c99dd9ca5 /board/Marvell/db64460 | |
| parent | 658c3b9eafd0167fd150f129c0720eb305efc225 (diff) | |
| download | u-boot-imx-021f6038a233bc6a60edc4adc1819492fddff9ff.zip u-boot-imx-021f6038a233bc6a60edc4adc1819492fddff9ff.tar.gz u-boot-imx-021f6038a233bc6a60edc4adc1819492fddff9ff.tar.bz2 | |
PPC: Drop mv6446x_eth_initialize() from net/eth.c
This function was defined as an extern in net/eth.c, drop that and use
standard means of calling it.
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Stefan Roese <sr@denx.de>
Diffstat (limited to 'board/Marvell/db64460')
| -rw-r--r-- | board/Marvell/db64460/db64460.c | 6 | ||||
| -rw-r--r-- | board/Marvell/db64460/eth.h | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/board/Marvell/db64460/db64460.c b/board/Marvell/db64460/db64460.c index a7836ed..d4f58b3 100644 --- a/board/Marvell/db64460/db64460.c +++ b/board/Marvell/db64460/db64460.c @@ -934,5 +934,9 @@ void board_prebootm_init () int board_eth_init(bd_t *bis) { - return pci_eth_init(bis); + int ret; + ret = pci_eth_init(bis); + if (!ret) + ret = mv6446x_eth_initialize(bis); + return ret; } diff --git a/board/Marvell/db64460/eth.h b/board/Marvell/db64460/eth.h index 6c3b2e0..59cfd6f 100644 --- a/board/Marvell/db64460/eth.h +++ b/board/Marvell/db64460/eth.h @@ -38,4 +38,6 @@ int db64460_eth0_transmit(unsigned int s, volatile char *p); void db64460_eth0_disable(void); bool network_start(bd_t *bis); +int mv6446x_eth_initialize(bd_t *); + #endif /* __EVB64460_ETH_H__ */ |