[U-Boot] [PATCH] Moved initialization of QE Ethernet controller to cpu_eth_init()

public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed

From: Ben Warren <biggerbadderben@gmail.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH] Moved initialization of QE Ethernet controller to cpu_eth_init()
Date: Wed, 29 Oct 2008 22:53:05 -0700	[thread overview]
Message-ID: <1225345987-28478-4-git-send-email-biggerbadderben@gmail.com> (raw)
In-Reply-To: <1225345987-28478-3-git-send-email-biggerbadderben@gmail.com>

Removed initialization of the driver from net/eth.c

Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
---
 cpu/mpc83xx/cpu.c |   20 +++++++++++++++++++-
 cpu/mpc85xx/cpu.c |   18 ++++++++++++++++++
 include/netdev.h  |    1 +
 net/eth.c         |   19 -------------------
 4 files changed, 38 insertions(+), 20 deletions(-)

diff --git a/cpu/mpc83xx/cpu.c b/cpu/mpc83xx/cpu.c
index aa9b18d..ebcc790 100644
--- a/cpu/mpc83xx/cpu.c
+++ b/cpu/mpc83xx/cpu.c
@@ -33,6 +33,7 @@
 #include <asm/processor.h>
 #include <libfdt.h>
 #include <tsec.h>
+#include <netdev.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -361,9 +362,26 @@ int dma_xfer(void *dest, u32 count, void *src)
  */
 int cpu_eth_init(bd_t *bis)
 {
+#if defined(CONFIG_UEC_ETH1)
+	uec_initialize(0);
+#endif
+#if defined(CONFIG_UEC_ETH2)
+	uec_initialize(1);
+#endif
+#if defined(CONFIG_UEC_ETH3)
+	uec_initialize(2);
+#endif
+#if defined(CONFIG_UEC_ETH4)
+	uec_initialize(3);
+#endif
+#if defined(CONFIG_UEC_ETH5)
+	uec_initialize(4);
+#endif
+#if defined(CONFIG_UEC_ETH6)
+	uec_initialize(5);
+#endif
 #if defined(CONFIG_TSEC_ENET)
 	tsec_standard_init(bis);
 #endif
-
 	return 0;
 }
diff --git a/cpu/mpc85xx/cpu.c b/cpu/mpc85xx/cpu.c
index d9e099c..02ac67d 100644
--- a/cpu/mpc85xx/cpu.c
+++ b/cpu/mpc85xx/cpu.c
@@ -383,6 +383,24 @@ int cpu_eth_init(bd_t *bis)
 #if defined(CONFIG_ETHER_ON_FCC)
 	fec_initialize(bis);
 #endif
+#if defined(CONFIG_UEC_ETH1)
+	uec_initialize(0);
+#endif
+#if defined(CONFIG_UEC_ETH2)
+	uec_initialize(1);
+#endif
+#if defined(CONFIG_UEC_ETH3)
+	uec_initialize(2);
+#endif
+#if defined(CONFIG_UEC_ETH4)
+	uec_initialize(3);
+#endif
+#if defined(CONFIG_UEC_ETH5)
+	uec_initialize(4);
+#endif
+#if defined(CONFIG_UEC_ETH6)
+	uec_initialize(5);
+#endif
 #if defined(CONFIG_TSEC_ENET)
 	tsec_standard_init(bis);
 #endif
diff --git a/include/netdev.h b/include/netdev.h
index 0d1b0d5..3b11961 100644
--- a/include/netdev.h
+++ b/include/netdev.h
@@ -65,6 +65,7 @@ int rtl8139_initialize(bd_t *bis);
 int rtl8169_initialize(bd_t *bis);
 int skge_initialize(bd_t *bis);
 int tsi108_eth_initialize(bd_t *bis);
+int uec_initialize(int index);
 int uli526x_initialize(bd_t *bis);
 
 /* Boards with PCI network controllers can call this from their board_eth_init()
diff --git a/net/eth.c b/net/eth.c
index 6cf53f4..3793dd7 100644
--- a/net/eth.c
+++ b/net/eth.c
@@ -44,7 +44,6 @@ extern int mv6436x_eth_initialize(bd_t *);
 extern int mv6446x_eth_initialize(bd_t *);
 extern int ppc_4xx_eth_initialize(bd_t *);
 extern int scc_initialize(bd_t*);
-extern int uec_initialize(int);
 
 #ifdef CONFIG_API
 extern void (*push_packet)(volatile void *, int);
@@ -165,24 +164,6 @@ int eth_initialize(bd_t *bis)
 #if defined(CONFIG_MPC8220_FEC)
 	mpc8220_fec_initialize(bis);
 #endif
-#if defined(CONFIG_UEC_ETH1)
-	uec_initialize(0);
-#endif
-#if defined(CONFIG_UEC_ETH2)
-	uec_initialize(1);
-#endif
-#if defined(CONFIG_UEC_ETH3)
-	uec_initialize(2);
-#endif
-#if defined(CONFIG_UEC_ETH4)
-	uec_initialize(3);
-#endif
-#if defined(CONFIG_UEC_ETH5)
-	uec_initialize(4);
-#endif
-#if defined(CONFIG_UEC_ETH6)
-	uec_initialize(5);
-#endif
 	if (!eth_devices) {
 		puts ("No ethernet found.\n");
 		show_boot_progress (-64);
-- 
1.5.4.3

next prev parent reply	other threads:[~2008-10-30  5:53 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-10-30  5:53 [U-Boot] [PATCH] net: Move initialization of Au1x00 SoC ethernet MAC to cpu_eth_init Ben Warren
2008-10-30  5:53 ` [U-Boot] [PATCH] Remove last reference to CONFIG_MPC85xx_FEC Ben Warren
2008-10-30  5:53   ` [U-Boot] [PATCH] Moved initialization of FCC Ethernet controller to cpu_eth_init Ben Warren
2008-10-30  5:53     ` Ben Warren [this message]
2008-10-30  5:53       ` [U-Boot] [PATCH] Moved initialization of MPC8220 FEC to cpu_eth_init() Ben Warren
2008-10-30  5:53         ` [U-Boot] [PATCH] Moved initialization of MPC8XX SCC " Ben Warren
2008-10-30 20:30   ` [U-Boot] [PATCH] Remove last reference to CONFIG_MPC85xx_FEC Andy Fleming
2008-10-30 20:33     ` Andy Fleming
2008-10-30 20:35     ` Ben Warren

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:aa9b18d dfblob:ebcc790 dfblob:d9e099c dfblob:02ac67d
dfblob:0d1b0d5 dfblob:3b11961 dfblob:6cf53f4 dfblob:3793dd7 )
 OR (
bs:"[U-Boot] [PATCH] Moved initialization of QE Ethernet controller to cpu_eth_init()" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1225345987-28478-4-git-send-email-biggerbadderben@gmail.com \
    --to=biggerbadderben@gmail.com \
    --cc=u-boot@lists.denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox