ppc4xx/net: Rename 4xx_enet to ppc4xx_emac
Subsystems (2)
PATCH 1/1 ppc4xx/net: Rename 4xx_enet to ppc4xx_emac
---
Ben, I think this patch should either go though your or my repository. I suggest that you pull it into yours (if nobody objects) since merging problems with the 4xx linker scripts are unlikely.
Thanks.
board/cray/L1/u-boot.lds | 2 +-
board/csb272/u-boot.lds | 2 +-
board/csb472/u-boot.lds | 2 +-
board/dave/PPChameleonEVB/u-boot.lds | 2 +-
board/eric/u-boot.lds | 2 +-
board/esd/ar405/u-boot.lds | 2 +-
board/esd/dp405/u-boot.lds | 2 +-
board/esd/hub405/u-boot.lds | 2 +-
board/esd/voh405/u-boot.lds | 2 +-
board/g2000/u-boot.lds | 2 +-
board/mpl/mip405/u-boot.lds | 2 +-
board/sandburst/karef/u-boot.lds | 2 +-
board/sandburst/karef/u-boot.lds.debug | 2 +-
board/sandburst/metrobox/u-boot.lds | 2 +-
board/sandburst/metrobox/u-boot.lds.debug | 2 +-
board/sbc405/u-boot.lds | 2 +-
board/xilinx/ml300/u-boot.lds | 2 +-
drivers/net/Makefile | 2 +-
drivers/net/{4xx_enet.c => ppc4xx_emac.c} | 0
19 files changed, 18 insertions(+), 18 deletions(-)
rename drivers/net/{4xx_enet.c => ppc4xx_emac.c} (100%)board/cray/L1/u-boot.lds +1 -1
@@ -68,7 +68,7 @@ SECTIONS cpu/ppc4xx/4xx_uart.o (.text) cpu/ppc4xx/cpu_init.o (.text) cpu/ppc4xx/speed.o (.text) - drivers/net/4xx_enet.o (.text) + drivers/net/ppc4xx_emac.o (.text) common/dlmalloc.o (.text) lib_generic/crc32.o (.text) lib_ppc/extable.o (.text)
board/csb272/u-boot.lds +1 -1
@@ -68,7 +68,7 @@ SECTIONS cpu/ppc4xx/4xx_uart.o (.text) cpu/ppc4xx/cpu_init.o (.text) cpu/ppc4xx/speed.o (.text) - drivers/net/4xx_enet.o (.text) + drivers/net/ppc4xx_emac.o (.text) common/dlmalloc.o (.text) lib_generic/crc32.o (.text)
board/csb472/u-boot.lds +1 -1
@@ -68,7 +68,7 @@ SECTIONS cpu/ppc4xx/4xx_uart.o (.text) cpu/ppc4xx/cpu_init.o (.text) cpu/ppc4xx/speed.o (.text) - drivers/net/4xx_enet.o (.text) + drivers/net/ppc4xx_emac.o (.text) common/dlmalloc.o (.text) lib_generic/crc32.o (.text)
board/dave/PPChameleonEVB/u-boot.lds +1 -1
@@ -66,7 +66,7 @@ SECTIONS cpu/ppc4xx/4xx_uart.o (.text) cpu/ppc4xx/cpu_init.o (.text) cpu/ppc4xx/speed.o (.text) - drivers/net/4xx_enet.o (.text) + drivers/net/ppc4xx_emac.o (.text) common/dlmalloc.o (.text) lib_generic/crc32.o (.text) lib_ppc/extable.o (.text)
board/eric/u-boot.lds +1 -1
@@ -68,7 +68,7 @@ SECTIONS cpu/ppc4xx/4xx_uart.o (.text) cpu/ppc4xx/cpu_init.o (.text) cpu/ppc4xx/speed.o (.text) - drivers/net/4xx_enet.o (.text) + drivers/net/ppc4xx_emac.o (.text) common/dlmalloc.o (.text) lib_generic/crc32.o (.text) lib_ppc/extable.o (.text)
board/esd/ar405/u-boot.lds +1 -1
@@ -66,7 +66,7 @@ SECTIONS cpu/ppc4xx/4xx_uart.o (.text) cpu/ppc4xx/cpu_init.o (.text) cpu/ppc4xx/speed.o (.text) - drivers/net/4xx_enet.o (.text) + drivers/net/ppc4xx_emac.o (.text) common/dlmalloc.o (.text) lib_generic/crc32.o (.text) lib_ppc/extable.o (.text)
board/esd/dp405/u-boot.lds +1 -1
@@ -66,7 +66,7 @@ SECTIONS cpu/ppc4xx/4xx_uart.o (.text) cpu/ppc4xx/cpu_init.o (.text) cpu/ppc4xx/speed.o (.text) - drivers/net/4xx_enet.o (.text) + drivers/net/ppc4xx_emac.o (.text) common/dlmalloc.o (.text) lib_generic/crc32.o (.text) lib_ppc/extable.o (.text)
board/esd/hub405/u-boot.lds +1 -1
@@ -66,7 +66,7 @@ SECTIONS cpu/ppc4xx/4xx_uart.o (.text) cpu/ppc4xx/cpu_init.o (.text) cpu/ppc4xx/speed.o (.text) - drivers/net/4xx_enet.o (.text) + drivers/net/ppc4xx_emac.o (.text) common/dlmalloc.o (.text) lib_generic/crc32.o (.text) lib_ppc/extable.o (.text)
board/esd/voh405/u-boot.lds +1 -1
@@ -66,7 +66,7 @@ SECTIONS cpu/ppc4xx/4xx_uart.o (.text) cpu/ppc4xx/cpu_init.o (.text) cpu/ppc4xx/speed.o (.text) - drivers/net/4xx_enet.o (.text) + drivers/net/ppc4xx_emac.o (.text) common/dlmalloc.o (.text) lib_generic/crc32.o (.text) lib_ppc/extable.o (.text)
board/g2000/u-boot.lds +1 -1
@@ -66,7 +66,7 @@ SECTIONS cpu/ppc4xx/4xx_uart.o (.text) cpu/ppc4xx/cpu_init.o (.text) cpu/ppc4xx/speed.o (.text) - drivers/net/4xx_enet.o (.text) + drivers/net/ppc4xx_emac.o (.text) common/dlmalloc.o (.text) lib_generic/crc32.o (.text) lib_ppc/extable.o (.text)
board/mpl/mip405/u-boot.lds +1 -1
@@ -72,7 +72,7 @@ SECTIONS cpu/ppc4xx/4xx_uart.o (.text) cpu/ppc4xx/cpu_init.o (.text) cpu/ppc4xx/speed.o (.text) - drivers/net/4xx_enet.o (.text) + drivers/net/ppc4xx_emac.o (.text) common/dlmalloc.o (.text) lib_generic/crc32.o (.text) lib_ppc/extable.o (.text)
board/sandburst/karef/u-boot.lds +1 -1
@@ -74,7 +74,7 @@ SECTIONS cpu/ppc4xx/4xx_uart.o (.text) cpu/ppc4xx/cpu_init.o (.text) cpu/ppc4xx/speed.o (.text) - drivers/net/4xx_enet.o (.text) + drivers/net/ppc4xx_emac.o (.text) common/dlmalloc.o (.text) lib_generic/crc32.o (.text) lib_ppc/extable.o (.text)
board/sandburst/karef/u-boot.lds.debug +1 -1
@@ -64,7 +64,7 @@ SECTIONS cpu/ppc4xx/4xx_uart.o (.text) cpu/ppc4xx/cpu_init.o (.text) cpu/ppc4xx/speed.o (.text) - drivers/net/4xx_enet.o (.text) + drivers/net/ppc4xx_emac.o (.text) common/dlmalloc.o (.text) lib_generic/crc32.o (.text) lib_ppc/extable.o (.text)
board/sandburst/metrobox/u-boot.lds +1 -1
@@ -74,7 +74,7 @@ SECTIONS cpu/ppc4xx/4xx_uart.o (.text) cpu/ppc4xx/cpu_init.o (.text) cpu/ppc4xx/speed.o (.text) - drivers/net/4xx_enet.o (.text) + drivers/net/ppc4xx_emac.o (.text) common/dlmalloc.o (.text) lib_generic/crc32.o (.text) lib_ppc/extable.o (.text)
board/sandburst/metrobox/u-boot.lds.debug +1 -1
@@ -64,7 +64,7 @@ SECTIONS cpu/ppc4xx/4xx_uart.o (.text) cpu/ppc4xx/cpu_init.o (.text) cpu/ppc4xx/speed.o (.text) - drivers/net/4xx_enet.o (.text) + drivers/net/ppc4xx_emac.o (.text) common/dlmalloc.o (.text) lib_generic/crc32.o (.text) lib_ppc/extable.o (.text)
board/sbc405/u-boot.lds +1 -1
@@ -66,7 +66,7 @@ SECTIONS cpu/ppc4xx/4xx_uart.o (.text) cpu/ppc4xx/cpu_init.o (.text) cpu/ppc4xx/speed.o (.text) - drivers/net/4xx_enet.o (.text) + drivers/net/ppc4xx_emac.o (.text) common/dlmalloc.o (.text) lib_generic/crc32.o (.text) lib_ppc/extable.o (.text)
board/xilinx/ml300/u-boot.lds +1 -1
@@ -64,7 +64,7 @@ SECTIONS cpu/ppc4xx/4xx_uart.o (.text) cpu/ppc4xx/cpu_init.o (.text) cpu/ppc4xx/speed.o (.text) - drivers/net/4xx_enet.o (.text) + drivers/net/ppc4xx_emac.o (.text) common/dlmalloc.o (.text) lib_generic/crc32.o (.text) lib_ppc/extable.o (.text)
drivers/net/Makefile +1 -1
@@ -26,7 +26,6 @@ include $(TOPDIR)/config.mk LIB := $(obj)libnet.a COBJS-$(CONFIG_DRIVER_3C589) += 3c589.o -COBJS-$(CONFIG_PPC4xx_EMAC) += 4xx_enet.o COBJS-$(CONFIG_DRIVER_AX88180) += ax88180.o COBJS-$(CONFIG_BCM570x) += bcm570x.o bcm570x_autoneg.o 5701rls.o COBJS-$(CONFIG_BFIN_MAC) += bfin_mac.o
@@ -55,6 +54,7 @@ COBJS-$(CONFIG_NS8382X) += ns8382x.o COBJS-$(CONFIG_DRIVER_NS9750_ETHERNET) += ns9750_eth.o COBJS-$(CONFIG_PCNET) += pcnet.o COBJS-$(CONFIG_PLB2800_ETHER) += plb2800_eth.o +COBJS-$(CONFIG_PPC4xx_EMAC) += ppc4xx_emac.o COBJS-$(CONFIG_DRIVER_RTL8019) += rtl8019.o COBJS-$(CONFIG_RTL8139) += rtl8139.o COBJS-$(CONFIG_RTL8169) += rtl8169.o
drivers/net/ppc4xx_emac.c renamed from drivers/net/4xx_enet.c +0 -0
Signature · 1 line
1.6.1.3
PATCH 1/1 ppc4xx/net: Rename 4xx_enet to ppc4xx_emac
Thanks,
Michal
Quoted 275 lines · Stefan Roese
Signed-off-by Stefan Roese <[email protected]>---
Ben, I think this patch should either go though your or my repository. I suggest that you pull it into yours (if nobody objects) since merging problems with the 4xx linker scripts are unlikely.Thanks.
board/cray/L1/u-boot.lds | 2 +- board/csb272/u-boot.lds | 2 +- board/csb472/u-boot.lds | 2 +- board/dave/PPChameleonEVB/u-boot.lds | 2 +- board/eric/u-boot.lds | 2 +- board/esd/ar405/u-boot.lds | 2 +- board/esd/dp405/u-boot.lds | 2 +- board/esd/hub405/u-boot.lds | 2 +- board/esd/voh405/u-boot.lds | 2 +- board/g2000/u-boot.lds | 2 +- board/mpl/mip405/u-boot.lds | 2 +- board/sandburst/karef/u-boot.lds | 2 +- board/sandburst/karef/u-boot.lds.debug | 2 +- board/sandburst/metrobox/u-boot.lds | 2 +- board/sandburst/metrobox/u-boot.lds.debug | 2 +- board/sbc405/u-boot.lds | 2 +- board/xilinx/ml300/u-boot.lds | 2 +- drivers/net/Makefile | 2 +- drivers/net/{4xx_enet.c => ppc4xx_emac.c} | 0 19 files changed, 18 insertions(+), 18 deletions(-) rename drivers/net/{4xx_enet.c => ppc4xx_emac.c} (100%)board/cray/L1/u-boot.lds +1
-1@@ -68,7 +68,7 @@ SECTIONS cpu/ppc4xx/4xx_uart.o (.text) cpu/ppc4xx/cpu_init.o (.text) cpu/ppc4xx/speed.o (.text) - drivers/net/4xx_enet.o (.text) + drivers/net/ppc4xx_emac.o (.text) common/dlmalloc.o (.text) lib_generic/crc32.o (.text) lib_ppc/extable.o (.text)board/csb272/u-boot.lds +1
-1@@ -68,7 +68,7 @@ SECTIONS cpu/ppc4xx/4xx_uart.o (.text) cpu/ppc4xx/cpu_init.o (.text) cpu/ppc4xx/speed.o (.text) - drivers/net/4xx_enet.o (.text) + drivers/net/ppc4xx_emac.o (.text) common/dlmalloc.o (.text) lib_generic/crc32.o (.text)board/csb472/u-boot.lds +1
-1@@ -68,7 +68,7 @@ SECTIONS cpu/ppc4xx/4xx_uart.o (.text) cpu/ppc4xx/cpu_init.o (.text) cpu/ppc4xx/speed.o (.text) - drivers/net/4xx_enet.o (.text) + drivers/net/ppc4xx_emac.o (.text) common/dlmalloc.o (.text) lib_generic/crc32.o (.text)board/dave/PPChameleonEVB/u-boot.lds +1
-1@@ -66,7 +66,7 @@ SECTIONS cpu/ppc4xx/4xx_uart.o (.text) cpu/ppc4xx/cpu_init.o (.text) cpu/ppc4xx/speed.o (.text) - drivers/net/4xx_enet.o (.text) + drivers/net/ppc4xx_emac.o (.text) common/dlmalloc.o (.text) lib_generic/crc32.o (.text) lib_ppc/extable.o (.text)board/eric/u-boot.lds +1
-1@@ -68,7 +68,7 @@ SECTIONS cpu/ppc4xx/4xx_uart.o (.text) cpu/ppc4xx/cpu_init.o (.text) cpu/ppc4xx/speed.o (.text) - drivers/net/4xx_enet.o (.text) + drivers/net/ppc4xx_emac.o (.text) common/dlmalloc.o (.text) lib_generic/crc32.o (.text) lib_ppc/extable.o (.text)board/esd/ar405/u-boot.lds +1
-1@@ -66,7 +66,7 @@ SECTIONS cpu/ppc4xx/4xx_uart.o (.text) cpu/ppc4xx/cpu_init.o (.text) cpu/ppc4xx/speed.o (.text) - drivers/net/4xx_enet.o (.text) + drivers/net/ppc4xx_emac.o (.text) common/dlmalloc.o (.text) lib_generic/crc32.o (.text) lib_ppc/extable.o (.text)board/esd/dp405/u-boot.lds +1
-1@@ -66,7 +66,7 @@ SECTIONS cpu/ppc4xx/4xx_uart.o (.text) cpu/ppc4xx/cpu_init.o (.text) cpu/ppc4xx/speed.o (.text) - drivers/net/4xx_enet.o (.text) + drivers/net/ppc4xx_emac.o (.text) common/dlmalloc.o (.text) lib_generic/crc32.o (.text) lib_ppc/extable.o (.text)board/esd/hub405/u-boot.lds +1
-1@@ -66,7 +66,7 @@ SECTIONS cpu/ppc4xx/4xx_uart.o (.text) cpu/ppc4xx/cpu_init.o (.text) cpu/ppc4xx/speed.o (.text) - drivers/net/4xx_enet.o (.text) + drivers/net/ppc4xx_emac.o (.text) common/dlmalloc.o (.text) lib_generic/crc32.o (.text) lib_ppc/extable.o (.text)board/esd/voh405/u-boot.lds +1
-1@@ -66,7 +66,7 @@ SECTIONS cpu/ppc4xx/4xx_uart.o (.text) cpu/ppc4xx/cpu_init.o (.text) cpu/ppc4xx/speed.o (.text) - drivers/net/4xx_enet.o (.text) + drivers/net/ppc4xx_emac.o (.text) common/dlmalloc.o (.text) lib_generic/crc32.o (.text) lib_ppc/extable.o (.text)board/g2000/u-boot.lds +1
-1@@ -66,7 +66,7 @@ SECTIONS cpu/ppc4xx/4xx_uart.o (.text) cpu/ppc4xx/cpu_init.o (.text) cpu/ppc4xx/speed.o (.text) - drivers/net/4xx_enet.o (.text) + drivers/net/ppc4xx_emac.o (.text) common/dlmalloc.o (.text) lib_generic/crc32.o (.text) lib_ppc/extable.o (.text)board/mpl/mip405/u-boot.lds +1
-1@@ -72,7 +72,7 @@ SECTIONS cpu/ppc4xx/4xx_uart.o (.text) cpu/ppc4xx/cpu_init.o (.text) cpu/ppc4xx/speed.o (.text) - drivers/net/4xx_enet.o (.text) + drivers/net/ppc4xx_emac.o (.text) common/dlmalloc.o (.text) lib_generic/crc32.o (.text) lib_ppc/extable.o (.text)board/sandburst/karef/u-boot.lds +1
-1@@ -74,7 +74,7 @@ SECTIONS cpu/ppc4xx/4xx_uart.o (.text) cpu/ppc4xx/cpu_init.o (.text) cpu/ppc4xx/speed.o (.text) - drivers/net/4xx_enet.o (.text) + drivers/net/ppc4xx_emac.o (.text) common/dlmalloc.o (.text) lib_generic/crc32.o (.text) lib_ppc/extable.o (.text)board/sandburst/karef/u-boot.lds.debug +1
-1@@ -64,7 +64,7 @@ SECTIONS cpu/ppc4xx/4xx_uart.o (.text) cpu/ppc4xx/cpu_init.o (.text) cpu/ppc4xx/speed.o (.text) - drivers/net/4xx_enet.o (.text) + drivers/net/ppc4xx_emac.o (.text) common/dlmalloc.o (.text) lib_generic/crc32.o (.text) lib_ppc/extable.o (.text)board/sandburst/metrobox/u-boot.lds +1
-1@@ -74,7 +74,7 @@ SECTIONS cpu/ppc4xx/4xx_uart.o (.text) cpu/ppc4xx/cpu_init.o (.text) cpu/ppc4xx/speed.o (.text) - drivers/net/4xx_enet.o (.text) + drivers/net/ppc4xx_emac.o (.text) common/dlmalloc.o (.text) lib_generic/crc32.o (.text) lib_ppc/extable.o (.text)board/sandburst/metrobox/u-boot.lds.debug +1
-1@@ -64,7 +64,7 @@ SECTIONS cpu/ppc4xx/4xx_uart.o (.text) cpu/ppc4xx/cpu_init.o (.text) cpu/ppc4xx/speed.o (.text) - drivers/net/4xx_enet.o (.text) + drivers/net/ppc4xx_emac.o (.text) common/dlmalloc.o (.text) lib_generic/crc32.o (.text) lib_ppc/extable.o (.text)board/sbc405/u-boot.lds +1
-1@@ -66,7 +66,7 @@ SECTIONS cpu/ppc4xx/4xx_uart.o (.text) cpu/ppc4xx/cpu_init.o (.text) cpu/ppc4xx/speed.o (.text) - drivers/net/4xx_enet.o (.text) + drivers/net/ppc4xx_emac.o (.text) common/dlmalloc.o (.text) lib_generic/crc32.o (.text) lib_ppc/extable.o (.text)board/xilinx/ml300/u-boot.lds +1
-1@@ -64,7 +64,7 @@ SECTIONS cpu/ppc4xx/4xx_uart.o (.text) cpu/ppc4xx/cpu_init.o (.text) cpu/ppc4xx/speed.o (.text) - drivers/net/4xx_enet.o (.text) + drivers/net/ppc4xx_emac.o (.text) common/dlmalloc.o (.text) lib_generic/crc32.o (.text) lib_ppc/extable.o (.text)drivers/net/Makefile +1
-1@@ -26,7 +26,6 @@ include $(TOPDIR)/config.mk LIB := $(obj)libnet.a COBJS-$(CONFIG_DRIVER_3C589) += 3c589.o -COBJS-$(CONFIG_PPC4xx_EMAC) += 4xx_enet.o COBJS-$(CONFIG_DRIVER_AX88180) += ax88180.o COBJS-$(CONFIG_BCM570x) += bcm570x.o bcm570x_autoneg.o 5701rls.o COBJS-$(CONFIG_BFIN_MAC) += bfin_mac.o@@ -55,6 +54,7 @@ COBJS-$(CONFIG_NS8382X) += ns8382x.o COBJS-$(CONFIG_DRIVER_NS9750_ETHERNET) += ns9750_eth.o COBJS-$(CONFIG_PCNET) += pcnet.o COBJS-$(CONFIG_PLB2800_ETHER) += plb2800_eth.o +COBJS-$(CONFIG_PPC4xx_EMAC) += ppc4xx_emac.o COBJS-$(CONFIG_DRIVER_RTL8019) += rtl8019.o COBJS-$(CONFIG_RTL8139) += rtl8139.o COBJS-$(CONFIG_RTL8169) += rtl8169.odrivers/net/ppc4xx_emac.c renamed from drivers/net/4xx_enet.c +0
-0
PATCH 1/1 ppc4xx/net: Rename 4xx_enet to ppc4xx_emac
In reply to Stefan RoeseQuoted 6 lines · Stefan Roese
Signed-off-by Stefan Roese <[email protected]>---
Ben, I think this patch should either go though your or my repository. I suggest that you pull it into yours (if nobody objects) since merging problems with the 4xx linker scripts are unlikely.
Will do. I forgot how non-trivial this is and why I didn't do it when I moved the driver over...
thanks,
Ben