Skip to contentSkip to conversation

KS8695: convert KS8695 eth driver to CONFIG_MULTI_ETH

PATCH New Greg Ungerer 3 participants 4 messages Sep 10, 2011 – Sep 12, 2011 Network drivers

lore
Share & tools
lore

Greg Ungerer

author
#0 lore raw

PATCH 1/1 KS8695: convert KS8695 eth driver to CONFIG_MULTI_ETH

Trivial conversion of the ks8695eth driver to a CONFIG_MULTI_ETH type driver.

Signed-off-by Greg Ungerer <[email protected]>
---
 board/cm4008/cm4008.c    |    4 ++++
 board/cm41xx/cm41xx.c    |    4 ++++
 drivers/net/ks8695eth.c  |   42 ++++++++++++++++++++++++++++--------------
 include/configs/cm4008.h |    1 +
 include/configs/cm41xx.h |    1 +
 include/netdev.h         |    1 +
 6 files changed, 39 insertions(+), 14 deletions(-)
board/cm4008/cm4008.c +4 -0
index 63296f0..2e8d948 100644
@@ -74,6 +74,10 @@ int board_late_init (void)
 	return 0;
 }
 
+int board_eth_init(bd_t *bis)
+{
+	return ks8695_eth_initialize();
+}
 
 int board_init (void)
 {
board/cm41xx/cm41xx.c +4 -0
index 9a6d89f..72fd64d 100644
@@ -74,6 +74,10 @@ int board_late_init (void)
 	return 0;
 }
 
+int board_eth_init(bd_t *bis)
+{
+	return ks8695_eth_initialize();
+}
 
 int board_init (void)
 {
drivers/net/ks8695eth.c +28 -14

75 lines not on this page · raw message

include/configs/cm4008.h +1 -0
index 81e4de4..5777062 100644
@@ -38,6 +38,7 @@
 #define CONFIG_INITRD_TAG	 1
 
 #define CONFIG_DRIVER_KS8695ETH		/* use KS8695 ethernet driver	*/
+#define CONFIG_NET_MULTI
 
 /*
  * Size of malloc() pool
include/configs/cm41xx.h +1 -0
index 785ab0a..66e689a 100644
@@ -38,6 +38,7 @@
 #define CONFIG_INITRD_TAG	 1
 
 #define CONFIG_DRIVER_KS8695ETH		/* use KS8695 ethernet driver	*/
+#define CONFIG_NET_MULTI
 
 /*
  * Size of malloc() pool
include/netdev.h +1 -0
index 6f0a971..83d7886 100644
@@ -66,6 +66,7 @@ int ftmac100_initialize(bd_t *bits);
 int greth_initialize(bd_t *bis);
 void gt6426x_eth_initialize(bd_t *bis);
 int inca_switch_initialize(bd_t *bis);
+int ks8695_eth_initialize(bd_t *bis);
 int lan91c96_initialize(u8 dev_num, int base_addr);
 int macb_eth_initialize(int id, void *regs, unsigned int phy_addr);
 int mcdmafec_initialize(bd_t *bis);
Signature · 1 line
1.7.4.1
Applied
#1 lore raw

PATCH 1/1 KS8695: convert KS8695 eth driver to CONFIG_MULTI_ETH

Dear Greg Ungerer,

Quoted 4 lines · In message <[email protected]> you…

Trivial conversion of the ks8695eth driver to a CONFIG_MULTI_ETH type driver.

Signed-off-by Greg Ungerer <[email protected]>
Quoted 8 lines
---
 board/cm4008/cm4008.c    |    4 ++++
 board/cm41xx/cm41xx.c    |    4 ++++
 drivers/net/ks8695eth.c  |   42 ++++++++++++++++++++++++++++--------------
 include/configs/cm4008.h |    1 +
 include/configs/cm41xx.h |    1 +
 include/netdev.h         |    1 +
 6 files changed, 39 insertions(+), 14 deletions(-)

Applied, thanks.

Best regards,

Wolfgang Denk

Signature · 4 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Include the success of others in your dreams for your own success.
#2 lore raw

PATCH 1/1 KS8695: convert KS8695 eth driver to CONFIG_MULTI_ETH

In reply to Greg Ungerer

include/netdev.h

Quoted 4 lines · On Saturday, September 10, 2011 04:40:34 Greg Ungerer wrote:
include/netdev.h +1 -0
 
+int ks8695_eth_initialize(bd_t *bis);

so you say the func needs bd_t* ...

board/cm41xx/cm41xx.c

Quoted 9 lines
board/cm4008/cm4008.c +0 -0
board/cm41xx/cm41xx.c +4 -0
 
+int board_eth_init(bd_t *bis)
+{
+	return ks8695_eth_initialize();
+}

but you dont pass it in the board funcs ...

drivers/net/ks8695eth.c int eth_send(volatile void *packet, int len) · line 224

Quoted 4 lines
drivers/net/ks8695eth.c +1 -0
 
+int ks8695_eth_initialize(void)

nor does the func itself even take it ...

not sure how this compiles ? do none of these files include netdev.h ? if they don't, i don't see how it compiles cleanly as that means you'd get warnings about implicit func prototypes ...
-mike
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: This is a digitally signed message part.
Url : http://lists.denx.de/pipermail/u-boot/attachments/20110911/5faae601/attachment.pgp

author
#3 lore raw

PATCH 1/1 KS8695: convert KS8695 eth driver to CONFIG_MULTI_ETH

Quoted 23 lines · Mike Frysinger

include/netdev.h

Quoted 4 lines · On Saturday, September 10, 2011 04:40:34 Greg Ungerer wrote:
include/netdev.h +1 -0
 
+int ks8695_eth_initialize(bd_t *bis);

so you say the func needs bd_t* ...

board/cm41xx/cm41xx.c

Quoted 9 lines
board/cm4008/cm4008.c +0 -0
board/cm41xx/cm41xx.c +4 -0
 
+int board_eth_init(bd_t *bis)
+{
+	return ks8695_eth_initialize();
+}

but you dont pass it in the board funcs ...

Quoted 3 lines
drivers/net/ks8695eth.c +0 -0
Quoted 7 lines
Quoted 1 line

+int ks8695_eth_initialize(void)

nor does the func itself even take it ...

not sure how this compiles ? do none of these files include netdev.h ? if they don't, i don't see how it compiles cleanly as that means you'd get warnings about implicit func prototypes ...

It compiled with a warning. Wolfgang fixed it in a follow-up patch.

Regards
Greg