diff options
| author | Marek Vasut <marex@denx.de> | 2012-03-02 22:39:31 +0000 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2012-03-06 21:13:22 +0100 |
| commit | 658c3b9eafd0167fd150f129c0720eb305efc225 (patch) | |
| tree | 3a9e2fc5deb5db12ba386a797ff791fcf703bd0a /board/Marvell | |
| parent | 4c12eeb8b55483e48ef98b8a480e2bbacc9f210d (diff) | |
| download | blackbird-obmc-uboot-658c3b9eafd0167fd150f129c0720eb305efc225.tar.gz blackbird-obmc-uboot-658c3b9eafd0167fd150f129c0720eb305efc225.zip | |
PPC: Drop mv6436x_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: Reinhard Arlt <reinhard.arlt@esd-electronics.com>
Diffstat (limited to 'board/Marvell')
| -rw-r--r-- | board/Marvell/db64360/db64360.c | 6 | ||||
| -rw-r--r-- | board/Marvell/db64360/eth.h | 1 |
2 files changed, 6 insertions, 1 deletions
diff --git a/board/Marvell/db64360/db64360.c b/board/Marvell/db64360/db64360.c index 5183466474..6cae68601d 100644 --- a/board/Marvell/db64360/db64360.c +++ b/board/Marvell/db64360/db64360.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 = mv6436x_eth_initialize(bis); + return ret; } diff --git a/board/Marvell/db64360/eth.h b/board/Marvell/db64360/eth.h index aab32d2a5a..6fbfdfea08 100644 --- a/board/Marvell/db64360/eth.h +++ b/board/Marvell/db64360/eth.h @@ -39,5 +39,6 @@ int db64360_eth0_transmit(unsigned int s, volatile char *p); void db64360_eth0_disable(void); bool network_start(bd_t *bis); +int mv6436x_eth_initialize(bd_t *); #endif /* __EVB64360_ETH_H__ */ |
