From mboxrd@z Thu Jan 1 00:00:00 1970 From: Shinya Kuribayashi Date: Sun, 08 Jun 2008 01:06:33 +0900 Subject: [U-Boot-Users] [PATCH 3/10] net: Conditional COBJS inclusion of Intel modules In-Reply-To: <484AB1AA.4060609@ruby.dti.ne.jp> References: <484AB0C3.4050906@ruby.dti.ne.jp> <484AB14D.3000404@ruby.dti.ne.jp> <484AB1AA.4060609@ruby.dti.ne.jp> Message-ID: <484AB209.2070201@ruby.dti.ne.jp> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de net: Conditional COBJS inclusion of Intel modules From: Shinya Kuribayashi Signed-off-by: Shinya Kuribayashi --- drivers/net/Makefile | 4 ++-- drivers/net/e1000.c | 5 ----- drivers/net/eepro100.c | 5 ----- 3 files changed, 2 insertions(+), 12 deletions(-) diff --git a/drivers/net/Makefile b/drivers/net/Makefile index 6413bb1..432fc10 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile @@ -31,8 +31,8 @@ COBJS-$(CONFIG_BFIN_MAC) += bfin_mac.o COBJS-y += cs8900.o COBJS-y += dc2114x.o COBJS-y += dm9000x.o -COBJS-y += e1000.o -COBJS-y += eepro100.o +COBJS-$(CONFIG_E1000) += e1000.o +COBJS-$(CONFIG_EEPRO100) += eepro100.o COBJS-y += enc28j60.o COBJS-y += fsl_mcdmafec.o COBJS-$(CONFIG_GRETH) += greth.o diff --git a/drivers/net/e1000.c b/drivers/net/e1000.c index c53c226..8f0e7d5 100644 --- a/drivers/net/e1000.c +++ b/drivers/net/e1000.c @@ -44,9 +44,6 @@ tested on both gig copper and gig fiber boards #include "e1000.h" -#if defined(CONFIG_CMD_NET) \ - && defined(CONFIG_NET_MULTI) && defined(CONFIG_E1000) - #define TOUT_LOOP 100000 #undef virt_to_bus @@ -3059,5 +3056,3 @@ e1000_initialize(bd_t * bis) } return 1; } - -#endif diff --git a/drivers/net/eepro100.c b/drivers/net/eepro100.c index 96ed271..9de0fb5 100644 --- a/drivers/net/eepro100.c +++ b/drivers/net/eepro100.c @@ -30,9 +30,6 @@ #undef DEBUG -#if defined(CONFIG_CMD_NET) \ - && defined(CONFIG_NET_MULTI) && defined(CONFIG_EEPRO100) - /* Ethernet chip registers. */ #define SCBStatus 0 /* Rx/Command Unit Status *Word* */ @@ -944,5 +941,3 @@ static void read_hw_addr (struct eth_device *dev, bd_t * bis) #endif } } - -#endif