commit b7081d91977aa3bf0cfc8284a463bd3901d0d6ad
author Reinhard Meyer (-VC) <reinhard.meyer@emk-elektronik.de> Fri Aug 06 18:42:07 2010 +0200
committer Ben Warren <biggerbadderben@gmail.com> Mon Oct 11 22:47:48 2010 -0700
tree a06299dbe930e6e84fb84bda2393f1af304f06c4
parent 91955834f5f4f58a6919a3005a8a4061cbbe7910

NET: move legacy enc28j60.c to sidetrack as enc28j60_lpc2292.c

This patch is required before the upcoming new enc28j60 driver
using SPI framework patch can be applied:
- Move legacy enc28j60.c to enc28j60_lpc2292.c.
- Change Makefile and the two affected boards' definition files.

Tested with ./MAKEALL ARM7 that both boards still compile.

Signed-off-by: Reinhard Meyer<info@emk-elektronik.de>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>

drivers/net/Makefile

diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 218eeff..479954d 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -39,7 +39,7 @@
 COBJS-$(CONFIG_DNET) += dnet.o
 COBJS-$(CONFIG_E1000) += e1000.o
 COBJS-$(CONFIG_EEPRO100) += eepro100.o
-COBJS-$(CONFIG_ENC28J60) += enc28j60.o
+COBJS-$(CONFIG_ENC28J60_LPC2292) += enc28j60_lpc2292.o
 COBJS-$(CONFIG_EP93XX) += ep93xx_eth.o
 COBJS-$(CONFIG_ETHOC) += ethoc.o
 COBJS-$(CONFIG_FEC_MXC) += fec_mxc.o

drivers/net/enc28j60_lpc2292.c

diff --git a/drivers/net/enc28j60.c b/drivers/net/enc28j60_lpc2292.c
similarity index 99%
rename from drivers/net/enc28j60.c
rename to drivers/net/enc28j60_lpc2292.c
index 3238a50..bf95052 100644
--- a/drivers/net/enc28j60.c
+++ b/drivers/net/enc28j60_lpc2292.c
@@ -15,6 +15,7 @@
  * MA 02111-1307 USA
  */
 
+#warning This driver is depreciated. Please update to new SPI framework enc28j60 driver
 #include <config.h>
 #include <common.h>
 #include <net.h>

include/configs/SMN42.h

diff --git a/include/configs/SMN42.h b/include/configs/SMN42.h
index adb6ac5..ba3ada1 100644
--- a/include/configs/SMN42.h
+++ b/include/configs/SMN42.h
@@ -198,6 +198,6 @@
 #define CONFIG_INITRD_TAG
 #define CONFIG_MMC			1
 /* we use this ethernet chip */
-#define CONFIG_ENC28J60
+#define CONFIG_ENC28J60_LPC2292
 
 #endif	/* __CONFIG_H */

include/configs/lpc2292sodimm.h

diff --git a/include/configs/lpc2292sodimm.h b/include/configs/lpc2292sodimm.h
index 7ce8d6d..65276a2 100644
--- a/include/configs/lpc2292sodimm.h
+++ b/include/configs/lpc2292sodimm.h
@@ -156,6 +156,6 @@
 #define CONFIG_INITRD_TAG
 #define CONFIG_MMC 1
 /* we use this ethernet chip */
-#define CONFIG_ENC28J60
+#define CONFIG_ENC28J60_LPC2292
 
 #endif	/* __CONFIG_H */