* [U-Boot] [PATCH] ppc4xx/net: Rename 4xx_enet to ppc4xx_emac
@ 2009-02-10 10:35 Stefan Roese
2009-02-10 10:38 ` Michal Simek
2009-02-10 15:10 ` Ben Warren
0 siblings, 2 replies; 3+ messages in thread
From: Stefan Roese @ 2009-02-10 10:35 UTC (permalink / raw)
To: u-boot
Signed-off-by: Stefan Roese <sr@denx.de>
---
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%)
diff --git a/board/cray/L1/u-boot.lds b/board/cray/L1/u-boot.lds
index d278866..c55a3af 100644
--- a/board/cray/L1/u-boot.lds
+++ b/board/cray/L1/u-boot.lds
@@ -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)
diff --git a/board/csb272/u-boot.lds b/board/csb272/u-boot.lds
index af87188..8e5e6ec 100644
--- a/board/csb272/u-boot.lds
+++ b/board/csb272/u-boot.lds
@@ -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)
diff --git a/board/csb472/u-boot.lds b/board/csb472/u-boot.lds
index 3736377..ebb97d6 100644
--- a/board/csb472/u-boot.lds
+++ b/board/csb472/u-boot.lds
@@ -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)
diff --git a/board/dave/PPChameleonEVB/u-boot.lds b/board/dave/PPChameleonEVB/u-boot.lds
index d3e6df9..b2e8b20 100644
--- a/board/dave/PPChameleonEVB/u-boot.lds
+++ b/board/dave/PPChameleonEVB/u-boot.lds
@@ -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)
diff --git a/board/eric/u-boot.lds b/board/eric/u-boot.lds
index bf46e18..6ffdd96 100644
--- a/board/eric/u-boot.lds
+++ b/board/eric/u-boot.lds
@@ -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)
diff --git a/board/esd/ar405/u-boot.lds b/board/esd/ar405/u-boot.lds
index 2c1cf92..f62f588 100644
--- a/board/esd/ar405/u-boot.lds
+++ b/board/esd/ar405/u-boot.lds
@@ -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)
diff --git a/board/esd/dp405/u-boot.lds b/board/esd/dp405/u-boot.lds
index d8fbea3..a9b594c 100644
--- a/board/esd/dp405/u-boot.lds
+++ b/board/esd/dp405/u-boot.lds
@@ -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)
diff --git a/board/esd/hub405/u-boot.lds b/board/esd/hub405/u-boot.lds
index 6908106..f10bffc 100644
--- a/board/esd/hub405/u-boot.lds
+++ b/board/esd/hub405/u-boot.lds
@@ -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)
diff --git a/board/esd/voh405/u-boot.lds b/board/esd/voh405/u-boot.lds
index d8fbea3..a9b594c 100644
--- a/board/esd/voh405/u-boot.lds
+++ b/board/esd/voh405/u-boot.lds
@@ -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)
diff --git a/board/g2000/u-boot.lds b/board/g2000/u-boot.lds
index d8fbea3..a9b594c 100644
--- a/board/g2000/u-boot.lds
+++ b/board/g2000/u-boot.lds
@@ -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)
diff --git a/board/mpl/mip405/u-boot.lds b/board/mpl/mip405/u-boot.lds
index 8714c2b..19b2962 100644
--- a/board/mpl/mip405/u-boot.lds
+++ b/board/mpl/mip405/u-boot.lds
@@ -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)
diff --git a/board/sandburst/karef/u-boot.lds b/board/sandburst/karef/u-boot.lds
index 6223f4e..494e625 100644
--- a/board/sandburst/karef/u-boot.lds
+++ b/board/sandburst/karef/u-boot.lds
@@ -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)
diff --git a/board/sandburst/karef/u-boot.lds.debug b/board/sandburst/karef/u-boot.lds.debug
index d00e252..c4df7e0 100644
--- a/board/sandburst/karef/u-boot.lds.debug
+++ b/board/sandburst/karef/u-boot.lds.debug
@@ -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)
diff --git a/board/sandburst/metrobox/u-boot.lds b/board/sandburst/metrobox/u-boot.lds
index 54e18e0..5a85bac 100644
--- a/board/sandburst/metrobox/u-boot.lds
+++ b/board/sandburst/metrobox/u-boot.lds
@@ -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)
diff --git a/board/sandburst/metrobox/u-boot.lds.debug b/board/sandburst/metrobox/u-boot.lds.debug
index a3350f2..f5b45a7 100644
--- a/board/sandburst/metrobox/u-boot.lds.debug
+++ b/board/sandburst/metrobox/u-boot.lds.debug
@@ -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)
diff --git a/board/sbc405/u-boot.lds b/board/sbc405/u-boot.lds
index d6f34c9..0a4d619 100644
--- a/board/sbc405/u-boot.lds
+++ b/board/sbc405/u-boot.lds
@@ -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)
diff --git a/board/xilinx/ml300/u-boot.lds b/board/xilinx/ml300/u-boot.lds
index 913ff6e..6b14e36 100644
--- a/board/xilinx/ml300/u-boot.lds
+++ b/board/xilinx/ml300/u-boot.lds
@@ -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)
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 128dc11..d50af0e 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -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
diff --git a/drivers/net/4xx_enet.c b/drivers/net/ppc4xx_emac.c
similarity index 100%
rename from drivers/net/4xx_enet.c
rename to drivers/net/ppc4xx_emac.c
--
1.6.1.3
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [U-Boot] [PATCH] ppc4xx/net: Rename 4xx_enet to ppc4xx_emac
2009-02-10 10:35 [U-Boot] [PATCH] ppc4xx/net: Rename 4xx_enet to ppc4xx_emac Stefan Roese
@ 2009-02-10 10:38 ` Michal Simek
2009-02-10 15:10 ` Ben Warren
1 sibling, 0 replies; 3+ messages in thread
From: Michal Simek @ 2009-02-10 10:38 UTC (permalink / raw)
To: u-boot
Thanks,
Michal
Stefan Roese wrote:
> Signed-off-by: Stefan Roese <sr@denx.de>
> ---
> 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%)
>
> diff --git a/board/cray/L1/u-boot.lds b/board/cray/L1/u-boot.lds
> index d278866..c55a3af 100644
> --- a/board/cray/L1/u-boot.lds
> +++ b/board/cray/L1/u-boot.lds
> @@ -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)
> diff --git a/board/csb272/u-boot.lds b/board/csb272/u-boot.lds
> index af87188..8e5e6ec 100644
> --- a/board/csb272/u-boot.lds
> +++ b/board/csb272/u-boot.lds
> @@ -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)
>
> diff --git a/board/csb472/u-boot.lds b/board/csb472/u-boot.lds
> index 3736377..ebb97d6 100644
> --- a/board/csb472/u-boot.lds
> +++ b/board/csb472/u-boot.lds
> @@ -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)
>
> diff --git a/board/dave/PPChameleonEVB/u-boot.lds b/board/dave/PPChameleonEVB/u-boot.lds
> index d3e6df9..b2e8b20 100644
> --- a/board/dave/PPChameleonEVB/u-boot.lds
> +++ b/board/dave/PPChameleonEVB/u-boot.lds
> @@ -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)
> diff --git a/board/eric/u-boot.lds b/board/eric/u-boot.lds
> index bf46e18..6ffdd96 100644
> --- a/board/eric/u-boot.lds
> +++ b/board/eric/u-boot.lds
> @@ -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)
> diff --git a/board/esd/ar405/u-boot.lds b/board/esd/ar405/u-boot.lds
> index 2c1cf92..f62f588 100644
> --- a/board/esd/ar405/u-boot.lds
> +++ b/board/esd/ar405/u-boot.lds
> @@ -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)
> diff --git a/board/esd/dp405/u-boot.lds b/board/esd/dp405/u-boot.lds
> index d8fbea3..a9b594c 100644
> --- a/board/esd/dp405/u-boot.lds
> +++ b/board/esd/dp405/u-boot.lds
> @@ -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)
> diff --git a/board/esd/hub405/u-boot.lds b/board/esd/hub405/u-boot.lds
> index 6908106..f10bffc 100644
> --- a/board/esd/hub405/u-boot.lds
> +++ b/board/esd/hub405/u-boot.lds
> @@ -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)
> diff --git a/board/esd/voh405/u-boot.lds b/board/esd/voh405/u-boot.lds
> index d8fbea3..a9b594c 100644
> --- a/board/esd/voh405/u-boot.lds
> +++ b/board/esd/voh405/u-boot.lds
> @@ -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)
> diff --git a/board/g2000/u-boot.lds b/board/g2000/u-boot.lds
> index d8fbea3..a9b594c 100644
> --- a/board/g2000/u-boot.lds
> +++ b/board/g2000/u-boot.lds
> @@ -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)
> diff --git a/board/mpl/mip405/u-boot.lds b/board/mpl/mip405/u-boot.lds
> index 8714c2b..19b2962 100644
> --- a/board/mpl/mip405/u-boot.lds
> +++ b/board/mpl/mip405/u-boot.lds
> @@ -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)
> diff --git a/board/sandburst/karef/u-boot.lds b/board/sandburst/karef/u-boot.lds
> index 6223f4e..494e625 100644
> --- a/board/sandburst/karef/u-boot.lds
> +++ b/board/sandburst/karef/u-boot.lds
> @@ -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)
> diff --git a/board/sandburst/karef/u-boot.lds.debug b/board/sandburst/karef/u-boot.lds.debug
> index d00e252..c4df7e0 100644
> --- a/board/sandburst/karef/u-boot.lds.debug
> +++ b/board/sandburst/karef/u-boot.lds.debug
> @@ -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)
> diff --git a/board/sandburst/metrobox/u-boot.lds b/board/sandburst/metrobox/u-boot.lds
> index 54e18e0..5a85bac 100644
> --- a/board/sandburst/metrobox/u-boot.lds
> +++ b/board/sandburst/metrobox/u-boot.lds
> @@ -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)
> diff --git a/board/sandburst/metrobox/u-boot.lds.debug b/board/sandburst/metrobox/u-boot.lds.debug
> index a3350f2..f5b45a7 100644
> --- a/board/sandburst/metrobox/u-boot.lds.debug
> +++ b/board/sandburst/metrobox/u-boot.lds.debug
> @@ -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)
> diff --git a/board/sbc405/u-boot.lds b/board/sbc405/u-boot.lds
> index d6f34c9..0a4d619 100644
> --- a/board/sbc405/u-boot.lds
> +++ b/board/sbc405/u-boot.lds
> @@ -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)
> diff --git a/board/xilinx/ml300/u-boot.lds b/board/xilinx/ml300/u-boot.lds
> index 913ff6e..6b14e36 100644
> --- a/board/xilinx/ml300/u-boot.lds
> +++ b/board/xilinx/ml300/u-boot.lds
> @@ -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)
> diff --git a/drivers/net/Makefile b/drivers/net/Makefile
> index 128dc11..d50af0e 100644
> --- a/drivers/net/Makefile
> +++ b/drivers/net/Makefile
> @@ -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
> diff --git a/drivers/net/4xx_enet.c b/drivers/net/ppc4xx_emac.c
> similarity index 100%
> rename from drivers/net/4xx_enet.c
> rename to drivers/net/ppc4xx_emac.c
^ permalink raw reply [flat|nested] 3+ messages in thread
* [U-Boot] [PATCH] ppc4xx/net: Rename 4xx_enet to ppc4xx_emac
2009-02-10 10:35 [U-Boot] [PATCH] ppc4xx/net: Rename 4xx_enet to ppc4xx_emac Stefan Roese
2009-02-10 10:38 ` Michal Simek
@ 2009-02-10 15:10 ` Ben Warren
1 sibling, 0 replies; 3+ messages in thread
From: Ben Warren @ 2009-02-10 15:10 UTC (permalink / raw)
To: u-boot
On Tue, Feb 10, 2009 at 2:35 AM, Stefan Roese <sr@denx.de> wrote:
> Signed-off-by: Stefan Roese <sr@denx.de>
> ---
> 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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2009-02-10 15:10 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-02-10 10:35 [U-Boot] [PATCH] ppc4xx/net: Rename 4xx_enet to ppc4xx_emac Stefan Roese
2009-02-10 10:38 ` Michal Simek
2009-02-10 15:10 ` Ben Warren
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.