[U-Boot-Users] [PATCH 9/10] net: Conditional COBJS inclusion of Freescale FEC modules

Shinya Kuribayashi
2008-06-07T16:14:54Z

net: Conditional COBJS inclusion of Freescale FEC modules

From: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>

Signed-off-by: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>
---

drivers/net/Makefile | 4 ++--
drivers/net/fsl_mcdmafec.c | 2 --
drivers/net/mcffec.c | 3 ---
3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index dc68f3e..ca30952 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -34,13 +34,13 @@ COBJS-y += dm9000x.o
COBJS-$(CONFIG_E1000) += e1000.o
COBJS-$(CONFIG_EEPRO100) += eepro100.o
COBJS-y += enc28j60.o
-COBJS-y += fsl_mcdmafec.o
+COBJS-$(CONFIG_FSLDMAFEC) += fsl_mcdmafec.o
COBJS-$(CONFIG_GRETH) += greth.o
COBJS-$(CONFIG_INCA_IP_SWITCH) += inca-ip_sw.o
COBJS-y += ks8695eth.o
COBJS-$(CONFIG_DRIVER_LAN91C96) += lan91c96.o
COBJS-y += macb.o
-COBJS-y += mcffec.o
+COBJS-$(CONFIG_MCFFEC) += mcffec.o
COBJS-$(CONFIG_NATSEMI) += natsemi.o
ifeq ($(CONFIG_DRIVER_NE2000),y)
COBJS-y += ne2000.o
diff --git a/drivers/net/fsl_mcdmafec.c b/drivers/net/fsl_mcdmafec.c
index 2ef91f2..b9602e1 100644
--- a/drivers/net/fsl_mcdmafec.c
+++ b/drivers/net/fsl_mcdmafec.c
@@ -31,7 +31,6 @@
#include <net.h>
#include <miiphy.h>

-#ifdef CONFIG_FSLDMAFEC
#undef ET_DEBUG
#undef MII_DEBUG

@@ -588,4 +587,3 @@ int mcdmafec_initialize(bd_t * bis)
}

#endif /* CONFIG_CMD_NET && CONFIG_NET_MULTI */
-#endif /* CONFIG_FSLDMAFEC */
diff --git a/drivers/net/mcffec.c b/drivers/net/mcffec.c
index 5ab4726..72743f1 100644
--- a/drivers/net/mcffec.c
+++ b/drivers/net/mcffec.c
@@ -27,8 +27,6 @@
#include <common.h>
#include <malloc.h>

-#ifdef CONFIG_MCFFEC
-
#include <asm/fec.h>
#include <asm/immap.h>

@@ -601,4 +599,3 @@ int mcffec_initialize(bd_t * bis)
}

#endif /* CONFIG_CMD_NET, FEC_ENET & NET_MULTI */
-#endif /* CONFIG_MCFFEC */