Moved PPC4xx EMAC driver to drivers/net

Also changed path in all linker scripts that reference this driver

Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
Acked-by: Stefan Roese <sr@denx.de>

diff --git a/board/cray/L1/u-boot.lds b/board/cray/L1/u-boot.lds
index 9d37257f5c5bee2f2aff424119c602aa318399a9..f5b10f8b806c0e7f3cf0cb57a4b117dbb879c404 100644 (file)
--- 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)
-    cpu/ppc4xx/4xx_enet.o      (.text)
+    drivers/net/4xx_enet.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 be381e17de2bad236c034efea6d3126d03aa9b6b..6c475553e2adbd274f6642a31ee3c7ed3112d919 100644 (file)
--- 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)
-    cpu/ppc4xx/4xx_enet.o      (.text)
+    drivers/net/4xx_enet.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 375150db15b8884280205f710cf2defb58029db9..fec2789d37691540c535dec0eee53c586a6fa334 100644 (file)
--- 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)
-    cpu/ppc4xx/4xx_enet.o      (.text)
+    drivers/net/4xx_enet.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 ed02cef81286aa9c8f4b9b185a55dca801ec8819..39bc654b67fad77dccc4513a5b7269c25bde63a9 100644 (file)
--- 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)
-    cpu/ppc4xx/4xx_enet.o      (.text)
+    drivers/net/4xx_enet.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 153e71f891aaa87d1e4b806e004186a031918c6c..42872b20fbf5b519eea7b087d3c33bb5a3ce32a0 100644 (file)
--- 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)
-    cpu/ppc4xx/4xx_enet.o      (.text)
+    drivers/net/4xx_enet.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 4a881b6eda8028c633304701a4e216691f87f89f..cb58360b57fad4377099bb87b007571a4ec12495 100644 (file)
--- 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)
-    cpu/ppc4xx/4xx_enet.o      (.text)
+    drivers/net/4xx_enet.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 7ff074c152ed5a6369351280009248d6a52b76e6..131166b6c45ebd99534346b6dcd5f3a6ca738818 100644 (file)
--- 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)
-    cpu/ppc4xx/4xx_enet.o      (.text)
+    drivers/net/4xx_enet.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 c4a1a4bc836501dc1c905ef13340db798da6535c..369241257c94a2b53e4a00929b13ca8d0dfdd7aa 100644 (file)
--- 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)
-    cpu/ppc4xx/4xx_enet.o      (.text)
+    drivers/net/4xx_enet.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 7ff074c152ed5a6369351280009248d6a52b76e6..131166b6c45ebd99534346b6dcd5f3a6ca738818 100644 (file)
--- 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)
-    cpu/ppc4xx/4xx_enet.o      (.text)
+    drivers/net/4xx_enet.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 7ff074c152ed5a6369351280009248d6a52b76e6..131166b6c45ebd99534346b6dcd5f3a6ca738818 100644 (file)
--- 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)
-    cpu/ppc4xx/4xx_enet.o      (.text)
+    drivers/net/4xx_enet.o     (.text)
     common/dlmalloc.o  (.text)
     lib_generic/crc32.o                (.text)
     lib_ppc/extable.o  (.text)

diff --git a/board/ml2/u-boot.lds b/board/ml2/u-boot.lds
index 1182f74002225318f88bdf508b1d2fa9a0010288..80bf644660c035bf6b2f3c0b8627f832454357b5 100644 (file)
--- a/board/ml2/u-boot.lds
+++ b/board/ml2/u-boot.lds
@@ -63,7 +63,7 @@ SECTIONS
     cpu/ppc4xx/4xx_uart.o      (.text)
     cpu/ppc4xx/cpu_init.o      (.text)
     cpu/ppc4xx/speed.o (.text)
-    cpu/ppc4xx/4xx_enet.o      (.text)
+    drivers/net/4xx_enet.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 717f0d24db076ca67605a98d04b466c6dcbea0c2..8b67fef6c498249d0dd4bc32bdcf4aacc84446ec 100644 (file)
--- 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)
-    cpu/ppc4xx/4xx_enet.o      (.text)
+    drivers/net/4xx_enet.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 9b2c0788f6fa1ef2699a5687e3107184f86c52e4..2439adb668c0913567637c59081d0190de3ec064 100644 (file)
--- 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)
-    cpu/ppc4xx/4xx_enet.o      (.text)
+    drivers/net/4xx_enet.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 15fe1e3f8b978106b49ec0bd4518aa91abc5a580..d00e25271628366815f4f7301893706e2452f1d8 100644 (file)
--- 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)
-    cpu/ppc4xx/4xx_enet.o      (.text)
+    drivers/net/4xx_enet.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 16e0709b5d107dbf2e2948bbc5d1e4a454e869fb..8c59a95f8c94fffceeea1aa2873aa0672cb287aa 100644 (file)
--- 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)
-    cpu/ppc4xx/4xx_enet.o      (.text)
+    drivers/net/4xx_enet.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 d122c050b015b5f5aa02bf7702211a1e387d3cd9..a3350f279277b008ae8c192038e2c6e1afe3ea36 100644 (file)
--- 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)
-    cpu/ppc4xx/4xx_enet.o      (.text)
+    drivers/net/4xx_enet.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 f3fd56f99cf8730f8c4f6cbdc1b41a33aa842ec3..08d6f0a05c89cb597f3ace333803eaf981d571ff 100644 (file)
--- 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)
-    cpu/ppc4xx/4xx_enet.o      (.text)
+    drivers/net/4xx_enet.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 f05c7a61ea9615aa989378b2c37d505e53139cc2..9c2174b806891e9ceb47507cad4a7343d6a84e1c 100644 (file)
--- 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)
-    cpu/ppc4xx/4xx_enet.o      (.text)
+    drivers/net/4xx_enet.o     (.text)
     common/dlmalloc.o  (.text)
     lib_generic/crc32.o                (.text)
     lib_ppc/extable.o  (.text)

diff --git a/cpu/ppc4xx/Makefile b/cpu/ppc4xx/Makefile
index adfe13ce720132b6a591cda0df07a6d0ab9bee45..96ab5c6a42a50de5492c25f92b11ad764194cb67 100644 (file)
--- a/cpu/ppc4xx/Makefile
+++ b/cpu/ppc4xx/Makefile
@@ -38,7 +38,6 @@ COBJS += 44x_spd_ddr2.o
 ifdef CONFIG_PPC4xx_DDR_AUTOCALIBRATION
 COBJS  += 4xx_ibm_ddr2_autocalib.o
 endif
-COBJS-$(CONFIG_PPC4xx_EMAC) += 4xx_enet.o
 COBJS  += 4xx_pci.o
 COBJS  += 4xx_pcie.o
 COBJS  += bedbug_405.o
@@ -61,7 +60,6 @@ COBJS += usb.o
 COBJS  += usb_ohci.o
 COBJS  += usbdev.o
 ifndef CONFIG_XILINX_440
-COBJS  += 4xx_enet.o
 COBJS  += 4xx_uart.o
 COBJS  += gpio.o
 COBJS  += miiphy.o

diff --git a/cpu/ppc4xx/4xx_enet.c b/drivers/net/4xx_enet.c
similarity index 100%
rename from cpu/ppc4xx/4xx_enet.c
rename to drivers/net/4xx_enet.c

diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 439c354f2aed61ed01ac9a3f2fe263cc96f9a331..9e4a854976ede36baf231b326858658863ab5334 100644 (file)
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -54,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) += 4xx_enet.o
 COBJS-$(CONFIG_DRIVER_RTL8019) += rtl8019.o
 COBJS-$(CONFIG_RTL8139) += rtl8139.o
 COBJS-$(CONFIG_RTL8169) += rtl8169.o