Skip to contentSkip to conversation

net/Blackfin: move on-chip MAC driver into drivers/net/

PATCH New Mike Frysinger 4 participants 6 messages Feb 25, 2008 – Mar 30, 2008 Network drivers

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 net/Blackfin: move on-chip MAC driver into drivers/net/

The Blackfin on-chip MAC driver was being managed in the BF537-STAMP board directory, but it is not board specific, so relocate it to the drivers dir so that other Blackfin ports can utilize it.

---
 board/bf537-stamp/Makefile      |    2 +-
 board/bf537-stamp/ether_bf537.c |  549 ---------------------------------------
 board/bf537-stamp/ether_bf537.h |   71 -----
 drivers/net/Makefile            |    1 +
 drivers/net/bfin_mac.c          |  523 +++++++++++++++++++++++++++++++++++++
 drivers/net/bfin_mac.h          |   89 +++++++
 6 files changed, 614 insertions(+), 621 deletions(-)
 delete mode 100644 board/bf537-stamp/ether_bf537.c
 delete mode 100644 board/bf537-stamp/ether_bf537.h
 create mode 100644 drivers/net/bfin_mac.c
 create mode 100644 drivers/net/bfin_mac.h
board/bf537-stamp/Makefile +1 -1
index e488844..fcdfd24 100644
@@ -29,7 +29,7 @@ include $(TOPDIR)/config.mk
 
 LIB	= $(obj)lib$(BOARD).a
 
-COBJS	:= $(BOARD).o flash.o ether_bf537.o post-memory.o stm_m25p64.o cmd_bf537led.o nand.o
+COBJS	:= $(BOARD).o flash.o post-memory.o stm_m25p64.o cmd_bf537led.o nand.o
 
 SRCS	:= $(SOBJS:.o=.S) $(COBJS:.o=.c)
 OBJS	:= $(addprefix $(obj),$(COBJS))
board/bf537-stamp/ether_bf537.c deleted +0 -549

549 lines not on this page · raw message

board/bf537-stamp/ether_bf537.h deleted +0 -71

71 lines not on this page · raw message

drivers/net/Makefile +1 -0
index b9723fa..321bd08 100644
@@ -27,6 +27,7 @@ LIB 	:= $(obj)libnet.a
 
 COBJS-y += 3c589.o
 COBJS-y += bcm570x.o bcm570x_autoneg.o 5701rls.o
+COBJS-$(CONFIG_BFIN_MAC) += bfin_mac.o
 COBJS-y += cs8900.o
 COBJS-y += dc2114x.o
 COBJS-y += dm9000x.o
drivers/net/bfin_mac.c new file +523 -0

523 lines not on this page · raw message

drivers/net/bfin_mac.h new file +89 -0

89 lines not on this page · raw message

Signature · 1 line
1.5.4.2
#1 lore raw

PATCH 1/1 net/Blackfin: move on-chip MAC driver into drivers/net/

Quoted 5 lines · On Sun, 24 Feb 2008 23:58:13 -0500 Mike Frysinger <[email protected]> wrote:

The Blackfin on-chip MAC driver was being managed in the BF537-STAMP board directory, but it is not board specific, so relocate it to the drivers dir so that other Blackfin ports can utilize it.

Quoted 12 lines
---
 board/bf537-stamp/Makefile      |    2 +-
 board/bf537-stamp/ether_bf537.c |  549 ---------------------------------------
 board/bf537-stamp/ether_bf537.h |   71 -----
 drivers/net/Makefile            |    1 +
 drivers/net/bfin_mac.c          |  523 +++++++++++++++++++++++++++++++++++++
 drivers/net/bfin_mac.h          |   89 +++++++
 6 files changed, 614 insertions(+), 621 deletions(-)
 delete mode 100644 board/bf537-stamp/ether_bf537.c
 delete mode 100644 board/bf537-stamp/ether_bf537.h
 create mode 100644 drivers/net/bfin_mac.c
 create mode 100644 drivers/net/bfin_mac.h

No objections from me, but I think it would be easier to review such patches if you generated them with git-format-patch -M or something similar. That makes the patch show the actual changes to the files without all the rename noise.

Haavard

#2 lore raw

PATCH 1/1 net/Blackfin: move on-chip MAC driver into drivers/net/

Quoted 21 lines · Haavard Skinnemoen
Quoted 5 lines · Mike Frysinger

The Blackfin on-chip MAC driver was being managed in the BF537-STAMP board directory, but it is not board specific, so relocate it to the drivers dir so that other Blackfin ports can utilize it.

Quoted 14 lines
---
 board/bf537-stamp/Makefile      |    2 +-
 board/bf537-stamp/ether_bf537.c |  549
--------------------------------------- board/bf537-stamp/ether_bf537.h |
  71 -----
 drivers/net/Makefile            |    1 +
 drivers/net/bfin_mac.c          |  523
+++++++++++++++++++++++++++++++++++++ drivers/net/bfin_mac.h          |  
89 +++++++
 6 files changed, 614 insertions(+), 621 deletions(-)
 delete mode 100644 board/bf537-stamp/ether_bf537.c
 delete mode 100644 board/bf537-stamp/ether_bf537.h
 create mode 100644 drivers/net/bfin_mac.c
 create mode 100644 drivers/net/bfin_mac.h
Quoted 3 lines

No objections from me, but I think it would be easier to review such patches if you generated them with git-format-patch -M or something similar.

thanks, i wasnt aware of that flag

Quoted 2 lines

That makes the patch show the actual changes to the files without all the rename noise.

in the case of the bfin_mac, the changes are minuscule: fix style in a place or two and delete dead code.
-mike
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 827 bytes
Desc: This is a digitally signed message part.
Url : http://lists.denx.de/pipermail/u-boot/attachments/20080227/67865df0/attachment.pgp

#3 lore raw

PATCH 1/1 net/Blackfin: move on-chip MAC driver into drivers/net/

Quoted 32 lines · Mike Frysinger
Quoted 22 lines · Haavard Skinnemoen
Quoted 5 lines · Mike Frysinger

The Blackfin on-chip MAC driver was being managed in the BF537-STAMP board directory, but it is not board specific, so relocate it to the drivers dir so that other Blackfin ports can utilize it.

Quoted 15 lines
---
 board/bf537-stamp/Makefile      |    2 +-
 board/bf537-stamp/ether_bf537.c |  549
--------------------------------------- board/bf537-stamp/ether_bf537.h |
  71 -----
 drivers/net/Makefile            |    1 +
 drivers/net/bfin_mac.c          |  523
+++++++++++++++++++++++++++++++++++++ drivers/net/bfin_mac.h          |  
89 +++++++
 6 files changed, 614 insertions(+), 621 deletions(-)
 delete mode 100644 board/bf537-stamp/ether_bf537.c
 delete mode 100644 board/bf537-stamp/ether_bf537.h
 create mode 100644 drivers/net/bfin_mac.c
 create mode 100644 drivers/net/bfin_mac.h
Quoted 4 lines

No objections from me, but I think it would be easier to review such patches if you generated them with git-format-patch -M or something similar.

thanks, i wasnt aware of that flag

Quoted 8 lines
Quoted 3 lines

That makes the patch show the actual changes to the files without all the rename noise.

in the case of the bfin_mac, the changes are minuscule: fix style in a place or two and delete dead code.
-mike

I'm sure you've only done trivial and progressive things, but if it's not too much trouble, please repost using the -M switch so we're only seeing real deltas.

thanks,
Ben

#4 lore raw

PATCH 1/1 net/Blackfin: move on-chip MAC driver into drivers/net/

In reply to Mike Frysinger
Quoted 5 lines · In message <[email protected]> you wrote:

The Blackfin on-chip MAC driver was being managed in the BF537-STAMP board directory, but it is not board specific, so relocate it to the drivers dir so that other Blackfin ports can utilize it.

Quoted 12 lines
---
 board/bf537-stamp/Makefile      |    2 +-
 board/bf537-stamp/ether_bf537.c |  549 ---------------------------------------
 board/bf537-stamp/ether_bf537.h |   71 -----
 drivers/net/Makefile            |    1 +
 drivers/net/bfin_mac.c          |  523 +++++++++++++++++++++++++++++++++++++
 drivers/net/bfin_mac.h          |   89 +++++++
 6 files changed, 614 insertions(+), 621 deletions(-)
 delete mode 100644 board/bf537-stamp/ether_bf537.c
 delete mode 100644 board/bf537-stamp/ether_bf537.h
 create mode 100644 drivers/net/bfin_mac.c
 create mode 100644 drivers/net/bfin_mac.h

Applied, but I had to fix some merge conflict in the Makefile.

Please verify that everything is OK.

Best regards,

Wolfgang Denk

Signature · 5 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
In general, they do what you want, unless you want consistency.
                                    - Larry Wall in the perl man page
#5 lore raw

PATCH 1/1 net/Blackfin: move on-chip MAC driver into drivers/net/

Quoted 21 lines · Wolfgang Denk
Quoted 5 lines · In message <[email protected]> you wrote:

The Blackfin on-chip MAC driver was being managed in the BF537-STAMP board directory, but it is not board specific, so relocate it to the drivers dir so that other Blackfin ports can utilize it.

Quoted 14 lines
---
 board/bf537-stamp/Makefile      |    2 +-
 board/bf537-stamp/ether_bf537.c |  549
--------------------------------------- board/bf537-stamp/ether_bf537.h |
  71 -----
 drivers/net/Makefile            |    1 +
 drivers/net/bfin_mac.c          |  523
+++++++++++++++++++++++++++++++++++++ drivers/net/bfin_mac.h          |  
89 +++++++
 6 files changed, 614 insertions(+), 621 deletions(-)
 delete mode 100644 board/bf537-stamp/ether_bf537.c
 delete mode 100644 board/bf537-stamp/ether_bf537.h
 create mode 100644 drivers/net/bfin_mac.c
 create mode 100644 drivers/net/bfin_mac.h
Quoted 3 lines

Applied, but I had to fix some merge conflict in the Makefile.

Please verify that everything is OK.

seems to be fine, thanks ... if i noticed something down the line i'll obviously just fix it myself ;)
-mike
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 827 bytes
Desc: This is a digitally signed message part.
Url : http://lists.denx.de/pipermail/u-boot/attachments/20080330/d7219cc6/attachment.pgp