From b7081d91977aa3bf0cfc8284a463bd3901d0d6ad Mon Sep 17 00:00:00 2001 From: "Reinhard Meyer (-VC)" Date: Fri, 6 Aug 2010 18:42:07 +0200 Subject: [PATCH] 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 Signed-off-by: Ben Warren --- drivers/net/Makefile | 2 +- drivers/net/{enc28j60.c => enc28j60_lpc2292.c} | 1 + include/configs/SMN42.h | 2 +- include/configs/lpc2292sodimm.h | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) rename drivers/net/{enc28j60.c => enc28j60_lpc2292.c} (99%) diff --git a/drivers/net/Makefile b/drivers/net/Makefile index 218eeff86e..479954d80c 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 similarity index 99% rename from drivers/net/enc28j60.c rename to drivers/net/enc28j60_lpc2292.c index 3238a502ca..bf9505206b 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 #include #include diff --git a/include/configs/SMN42.h b/include/configs/SMN42.h index adb6ac52e1..ba3ada13a5 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 7ce8d6de1f..65276a27c0 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 */ -- 2.39.5