summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorReinhard Meyer (-VC) <reinhard.meyer@emk-elektronik.de>2010-08-06 18:42:07 +0200
committerBen Warren <biggerbadderben@gmail.com>2010-10-11 22:47:48 -0700
commitb7081d91977aa3bf0cfc8284a463bd3901d0d6ad (patch)
treea06299dbe930e6e84fb84bda2393f1af304f06c4
parent91955834f5f4f58a6919a3005a8a4061cbbe7910 (diff)
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>
-rw-r--r--drivers/net/Makefile2
-rw-r--r--drivers/net/enc28j60_lpc2292.c (renamed from drivers/net/enc28j60.c)1
-rw-r--r--include/configs/SMN42.h2
-rw-r--r--include/configs/lpc2292sodimm.h2
4 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 218eeff86e6..479954d80c0 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -39,7 +39,7 @@ COBJS-$(CONFIG_DRIVER_DM9000) += dm9000x.o
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
diff --git a/drivers/net/enc28j60.c b/drivers/net/enc28j60_lpc2292.c
index 3238a502ca7..bf9505206be 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>
diff --git a/include/configs/SMN42.h b/include/configs/SMN42.h
index adb6ac52e12..ba3ada13a5a 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 */
diff --git a/include/configs/lpc2292sodimm.h b/include/configs/lpc2292sodimm.h
index 7ce8d6de1ff..65276a27c0b 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 */