summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Warren <biggerbadderben@gmail.com>2009-05-26 00:17:59 -0700
committerBen Warren <biggerbadderben@gmail.com>2009-06-15 00:13:54 -0700
commit09cdd1b9b01450e91786d26ff3c866dc9c8d8d6b (patch)
tree8f808e428796be2cd1a0a83bf8d57b8a2658b965
parent6f51deb7f298413cfcb0a36d24c97ef7dd69d48f (diff)
downloadu-boot-imx-09cdd1b9b01450e91786d26ff3c866dc9c8d8d6b.zip
u-boot-imx-09cdd1b9b01450e91786d26ff3c866dc9c8d8d6b.tar.gz
u-boot-imx-09cdd1b9b01450e91786d26ff3c866dc9c8d8d6b.tar.bz2
Moved Davinci Ethernet driver to drivers/net
This driver has been renamed davinci_emac.c Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
-rw-r--r--cpu/arm926ejs/davinci/Makefile2
-rw-r--r--drivers/net/Makefile1
-rw-r--r--drivers/net/davinci_emac.c (renamed from cpu/arm926ejs/davinci/ether.c)0
3 files changed, 2 insertions, 1 deletions
diff --git a/cpu/arm926ejs/davinci/Makefile b/cpu/arm926ejs/davinci/Makefile
index 6eaa89c..e45ad25 100644
--- a/cpu/arm926ejs/davinci/Makefile
+++ b/cpu/arm926ejs/davinci/Makefile
@@ -30,7 +30,7 @@ LIB = $(obj)lib$(SOC).a
COBJS-y += cpu.o timer.o psc.o
COBJS-$(CONFIG_SOC_DM355) += dm355.o
COBJS-$(CONFIG_SOC_DM644X) += dm644x.o
-COBJS-$(CONFIG_DRIVER_TI_EMAC) += ether.o lxt972.o dp83848.o
+COBJS-$(CONFIG_DRIVER_TI_EMAC) += lxt972.o dp83848.o
SOBJS = reset.o
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index a360a50..575d9d9 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -64,6 +64,7 @@ COBJS-$(CONFIG_SH_ETHER) += sh_eth.o
COBJS-$(CONFIG_DRIVER_SMC91111) += smc91111.o
COBJS-$(CONFIG_DRIVER_SMC911X) += smc911x.o
COBJS-$(CONFIG_TIGON3) += tigon3.o bcm570x_autoneg.o 5701rls.o
+COBJS-$(CONFIG_DRIVER_TI_EMAC) += davinci_emac.o
COBJS-$(CONFIG_TSEC_ENET) += tsec.o
COBJS-$(CONFIG_TSI108_ETH) += tsi108_eth.o
COBJS-$(CONFIG_ULI526X) += uli526x.o
diff --git a/cpu/arm926ejs/davinci/ether.c b/drivers/net/davinci_emac.c
index f6f81df..f6f81df 100644
--- a/cpu/arm926ejs/davinci/ether.c
+++ b/drivers/net/davinci_emac.c