From mboxrd@z Thu Jan 1 00:00:00 1970 From: Shinya Kuribayashi Date: Sun, 08 Jun 2008 01:11:40 +0900 Subject: [U-Boot-Users] [PATCH 7/10] net: Conditional COBJS inclusion of TSEC and Vitesse modules In-Reply-To: <484AB2E5.2090806@ruby.dti.ne.jp> References: <484AB0C3.4050906@ruby.dti.ne.jp> <484AB14D.3000404@ruby.dti.ne.jp> <484AB1AA.4060609@ruby.dti.ne.jp> <484AB28E.3040009@ruby.dti.ne.jp> <484AB2E5.2090806@ruby.dti.ne.jp> Message-ID: <484AB33C.3020305@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 TSEC and Vitesse modules From: Shinya Kuribayashi Signed-off-by: Shinya Kuribayashi --- drivers/net/Makefile | 4 ++-- drivers/net/tsec.c | 3 --- drivers/net/vsc7385.c | 5 ----- 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/drivers/net/Makefile b/drivers/net/Makefile index 70a6dde..3370aa4 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile @@ -60,10 +60,10 @@ COBJS-y += s3c4510b_eth.o COBJS-y += smc91111.o COBJS-y += smc911x.o COBJS-$(CONFIG_TIGON3) += tigon3.o bcm570x_autoneg.o 5701rls.o -COBJS-y += tsec.o +COBJS-$(CONFIG_TSEC_ENET) += tsec.o COBJS-y += tsi108_eth.o COBJS-y += uli526x.o -COBJS-y += vsc7385.o +COBJS-$(CONFIG_VSC7385_ENET) += vsc7385.o COBJS-$(CONFIG_XILINX_EMAC) += xilinx_emac.o COBJS-$(CONFIG_XILINX_EMACLITE) += xilinx_emaclite.o diff --git a/drivers/net/tsec.c b/drivers/net/tsec.c index c7af930..9d20918 100644 --- a/drivers/net/tsec.c +++ b/drivers/net/tsec.c @@ -17,7 +17,6 @@ #include #include -#if defined(CONFIG_TSEC_ENET) #include "tsec.h" #include "miiphy.h" @@ -1710,5 +1709,3 @@ tsec_mcast_addr (struct eth_device *dev, u8 mcast_mac, u8 set) return 0; } #endif /* Multicast TFTP ? */ - -#endif /* CONFIG_TSEC_ENET */ diff --git a/drivers/net/vsc7385.c b/drivers/net/vsc7385.c index 4095bce..4e7259f 100644 --- a/drivers/net/vsc7385.c +++ b/drivers/net/vsc7385.c @@ -13,9 +13,6 @@ */ #include - -#ifdef CONFIG_VSC7385_ENET - #include #include #include @@ -97,5 +94,3 @@ int vsc7385_upload_firmware(void *firmware, unsigned int size) return 0; } - -#endif