Skip to contentSkip to conversation

Moved initialization of GRETH Ethernet driver to CPU directory

PATCH New Ben Warren 2 participants 4 messages Jul 9, 2008

Subsystems (2)
Networking Network drivers
lore
Share & tools
lore

Ben Warren

author
#0 lore raw

cover Moved initialization of GRETH Ethernet driver to CPU directory

Hello,

More cleanup of net/eth.c, this time taking care of LEON2/LEON3 boards.

Lacking a compiler and target, I can't really test this so hopefully somebody can and will report back.

This patch is being staged in the 'testing' branch of the net repo.

regards,
Ben

author
#1 lore raw

PATCH 1/1 Moved initialization of GRETH Ethernet driver to CPU directory

Added a cpu_eth_init() function to leon2/leon3 CPU directories and removed code from net/eth.c

Signed-off-by Ben Warren <[email protected]>
---
 cpu/leon2/cpu.c     |    9 +++++++++
 cpu/leon3/cpu.c     |    8 ++++++++
 drivers/net/greth.c |    2 +-
 net/eth.c           |    4 ----
 4 files changed, 18 insertions(+), 5 deletions(-)
cpu/leon2/cpu.c +9 -0
index 1c1e24b..5de1c52 100644
@@ -56,3 +56,12 @@ int do_reset(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
 }
 
 /* ------------------------------------------------------------------------- */
+
+extern int greth_initialize(bd_t *bis);
+
+#ifdef CONFIG_GRETH
+int cpu_eth_init(bd_t *bis)
+{
+	return greth_initialize(bis);
+}
+#endif
cpu/leon3/cpu.c +8 -0
index 306a210..1725fdb 100644
@@ -65,3 +65,11 @@ u64 flash_read64(void *addr)
 }
 
 /* ------------------------------------------------------------------------- */
+extern int greth_initialize(bd_t *bis);
+
+#ifdef CONFIG_GRETH
+int cpu_eth_init(bd_t *bis)
+{
+	return greth_initialize(bis);
+}
+#endif
drivers/net/greth.c +1 -1
index 76ece59..90c5338 100644
@@ -657,5 +657,5 @@ int greth_initialize(bd_t * bis)
 	/* set and remember MAC address */
 	greth_set_hwaddr(greth, addr);
 
-	return 1;
+	return 0;
 }
net/eth.c +0 -4
index 132efce..3c152bf 100644
@@ -69,7 +69,6 @@ extern int uli526x_initialize(bd_t *);
 extern int npe_initialize(bd_t *);
 extern int uec_initialize(int);
 extern int bfin_EMAC_initialize(bd_t *);
-extern int greth_initialize(bd_t *);
 extern int at91sam9_eth_initialize(bd_t *);
 
 #ifdef CONFIG_API

@@ -267,9 +266,6 @@ int eth_initialize(bd_t *bis)
 #if defined(CONFIG_BF537)
 	bfin_EMAC_initialize(bis);
 #endif
-#if defined(CONFIG_GRETH)
-	greth_initialize(bis);
-#endif
 #if defined(CONFIG_AT91CAP9) || defined(CONFIG_AT91SAM9260) || \
     defined(CONFIG_AT91SAM9263)
 	at91sam9_eth_initialize(bis);
Signature · 1 line
1.5.4.3
#2 lore raw

cover Moved initialization of GRETH Ethernet driver to CPU directory

In reply to Ben Warren

Hello Ben,

I have tried the testing branch of the net repo (99b85ffa8ef0b07904be1db335825d4d83424eaa) on a GR-XC3S-1500 LEON3 board successfully.

LEON2 U-Boot support is limited to the LEON2 simmulator TSIM, TSIM-LEON2 does not support the GRETH so at this stage it is not neccessary for LEON2 to check CONFIG_GRETH. However, it might be useful later on.

Regards,
Daniel

Quoted 14 lines · Ben Warren

Hello,

More cleanup of net/eth.c, this time taking care of LEON2/LEON3 boards.

Lacking a compiler and target, I can't really test this so hopefully somebody can and will report back.

This patch is being staged in the 'testing' branch of the net repo.

regards,
Ben

author
#3 lore raw

cover Moved initialization of GRETH Ethernet driver to CPU directory

F

Quoted 10 lines · Daniel Hellstrom

Hello Ben,

I have tried the testing branch of the net repo (99b85ffa8ef0b07904be1db335825d4d83424eaa) on a GR-XC3S-1500 LEON3 board successfully.

LEON2 U-Boot support is limited to the LEON2 simmulator TSIM, TSIM-LEON2 does not support the GRETH so at this stage it is not neccessary for LEON2 to check CONFIG_GRETH. However, it might be useful later on.

Thanks a lot for testing this so quickly!

regards,
Ben