From 021f6038a233bc6a60edc4adc1819492fddff9ff Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Fri, 2 Mar 2012 22:39:32 +0000 Subject: 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 Cc: Stefan Roese --- board/Marvell/db64460/db64460.c | 6 +++++- board/Marvell/db64460/eth.h | 2 ++ board/prodrive/p3mx/eth.h | 1 + board/prodrive/p3mx/p3mx.c | 5 +++++ 4 files changed, 13 insertions(+), 1 deletion(-) (limited to 'board') diff --git a/board/Marvell/db64460/db64460.c b/board/Marvell/db64460/db64460.c index a7836edb4d..d4f58b3216 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 6c3b2e0ba0..59cfd6f3ea 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__ */ diff --git a/board/prodrive/p3mx/eth.h b/board/prodrive/p3mx/eth.h index aab32d2a5a..44ffba8c63 100644 --- a/board/prodrive/p3mx/eth.h +++ b/board/prodrive/p3mx/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 mv6446x_eth_initialize(bd_t *); #endif /* __EVB64360_ETH_H__ */ diff --git a/board/prodrive/p3mx/p3mx.c b/board/prodrive/p3mx/p3mx.c index 09e4f823f0..389affcde0 100644 --- a/board/prodrive/p3mx/p3mx.c +++ b/board/prodrive/p3mx/p3mx.c @@ -851,3 +851,8 @@ void my_remap_gt_regs_bootm (u32 cur_loc, u32 new_loc) != temp); } + +int board_eth_init(bd_t *bis) +{ + return mv6446x_eth_initialize(bis); +} -- cgit v1.2.3