Patchwork [U-Boot,2/2] PPC: Drop mv6446x_eth_initialize() from net/eth.c

login
register
mail settings
Submitter Marek Vasut
Date March 3, 2012, 8:39 a.m.
Message ID <1330763972-28106-2-git-send-email-marex@denx.de>
Download mbox | patch
Permalink /patch/144413/
State Accepted
Commit 021f6038a233bc6a60edc4adc1819492fddff9ff
Headers show

Comments

Marek Vasut - March 3, 2012, 8:39 a.m.
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>
---
 board/Marvell/db64460/db64460.c |    6 +++++-
 board/Marvell/db64460/eth.h     |    2 ++
 board/prodrive/p3mx/eth.h       |    1 +
 board/prodrive/p3mx/p3mx.c      |    5 +++++
 net/eth.c                       |    5 -----
 5 files changed, 13 insertions(+), 6 deletions(-)
Wolfgang Denk - March 6, 2012, 8:13 p.m.
Dear Marek Vasut,

In message <1330763972-28106-2-git-send-email-marex@denx.de> you wrote:
> 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>
> ---
>  board/Marvell/db64460/db64460.c |    6 +++++-
>  board/Marvell/db64460/eth.h     |    2 ++
>  board/prodrive/p3mx/eth.h       |    1 +
>  board/prodrive/p3mx/p3mx.c      |    5 +++++
>  net/eth.c                       |    5 -----
>  5 files changed, 13 insertions(+), 6 deletions(-)

Applied, thanks.

Best regards,

Wolfgang Denk

Patch

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__ */
diff --git a/board/prodrive/p3mx/eth.h b/board/prodrive/p3mx/eth.h
index aab32d2..44ffba8 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 09e4f82..389affc 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);
+}
diff --git a/net/eth.c b/net/eth.c
index 225b03f..801cc5f 100644
--- a/net/eth.c
+++ b/net/eth.c
@@ -81,8 +81,6 @@  static int __def_eth_init(bd_t *bis)
 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")));
 
-extern int mv6446x_eth_initialize(bd_t *);
-
 #ifdef CONFIG_API
 extern void (*push_packet)(volatile void *, int);
 
@@ -251,9 +249,6 @@  int eth_initialize(bd_t *bis)
 	} else
 		printf("Net Initialization Skipped\n");
 
-#if defined(CONFIG_DB64460) || defined(CONFIG_P3Mx)
-	mv6446x_eth_initialize(bis);
-#endif
 	if (!eth_devices) {
 		puts ("No ethernet found.\n");
 		show_boot_progress (-64);