minix/u-boot
1
0
Fork 0
mirror of https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git synced 2025-09-09 20:18:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

Moved conditional compilation to Makefile for SK98 Ethernet driver

Browse Source 
Brute-force removal of #ifdefs.  Didn't touch the code.
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
This commit is contained in:
Ben Warren 2008-07-12 00:08:45 -07:00
parent 65d3d99c28
commit 8379f42bc7
19 changed files with 4 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/net/sk98lin/Makefile
View File

@ -29,24 +29,12 @@ include $(TOPDIR)/config.mk
LIB := $(obj)libsk98lin.a LIB := $(obj)libsk98lin.a
COBJS-y += skge.o COBJS-$(CONFIG_SK98) += skge.o skaddr.o skgehwt.o skgeinit.o skgepnmi.o \
COBJS-y += skaddr.o skgesirq.o ski2c.o sklm80.o skqueue.o skrlmt.o sktimer.o \
COBJS-y += skgehwt.o skvpd.o skxmac2.o skcsum.o
COBJS-y += skgeinit.o
COBJS-y += skgepnmi.o
COBJS-y += skgesirq.o
COBJS-y += ski2c.o
COBJS-y += sklm80.o
COBJS-y += skqueue.o
COBJS-y += skrlmt.o
COBJS-y += sktimer.o
COBJS-y += skvpd.o
COBJS-y += skxmac2.o
COBJS-y += skcsum.o
#COBJS-y += skproc.o #COBJS-y += skproc.o
COBJS-y += uboot_skb.o COBJS-$(CONFIG_SK98) += uboot_skb.o uboot_drv.o
COBJS-y += uboot_drv.o
COBJS := $(COBJS-y) COBJS := $(COBJS-y)
SRCS := $(COBJS:.o=.c) SRCS := $(COBJS:.o=.c)

4
drivers/net/sk98lin/skaddr.c
View File

@ -220,8 +220,6 @@
#include <config.h> #include <config.h>
#ifdef CONFIG_SK98
#ifndef lint #ifndef lint
static const char SysKonnectFileId[] = static const char SysKonnectFileId[] =
"@(#) $Id: skaddr.c,v 1.48 2003/02/12 17:09:37 tschilli Exp $ (C) SysKonnect."; "@(#) $Id: skaddr.c,v 1.48 2003/02/12 17:09:37 tschilli Exp $ (C) SysKonnect.";
@ -1875,5 +1873,3 @@ SK_U32 ToPortNumber) /* Port2 Index */
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif /* __cplusplus */ #endif /* __cplusplus */
#endif /* CONFIG_SK98 */

4
drivers/net/sk98lin/skcsum.c
View File

@ -72,8 +72,6 @@
#include <config.h> #include <config.h>
#ifdef CONFIG_SK98
#ifdef SK_USE_CSUM /* Check if CSUM is to be used. */ #ifdef SK_USE_CSUM /* Check if CSUM is to be used. */
#ifndef lint #ifndef lint
@ -925,5 +923,3 @@ SK_EVPARA Param) /* Event dependent parameter. */
} /* SkCsEvent */ } /* SkCsEvent */
#endif /* SK_USE_CSUM */ #endif /* SK_USE_CSUM */
#endif /* CONFIG_SK98 */

4
drivers/net/sk98lin/skge.c
View File

@ -342,8 +342,6 @@
#include <config.h> #include <config.h>
#ifdef CONFIG_SK98
#include "h/skversion.h" #include "h/skversion.h"
#if 0 #if 0
#include <linux/module.h> #include <linux/module.h>
@ -4860,5 +4858,3 @@ int l;
} /* DumpLong */ } /* DumpLong */
#endif #endif
#endif /* CONFIG_SK98 */

5
drivers/net/sk98lin/skgehwt.c
View File

@ -75,8 +75,6 @@
#include <config.h> #include <config.h>
#ifdef CONFIG_SK98
/* /*
Event queue and dispatcher Event queue and dispatcher
*/ */
@ -214,7 +212,4 @@ SK_IOC Ioc) /* IoContext */
pAC->Hwt.TStop = pAC->Hwt.TStart; pAC->Hwt.TStop = pAC->Hwt.TStart;
SkTimerDone(pAC,Ioc) ; SkTimerDone(pAC,Ioc) ;
} }
#endif /* CONFIG_SK98 */
/* End of file */ /* End of file */

4
drivers/net/sk98lin/skgeinit.c
View File

@ -395,8 +395,6 @@
#include <config.h> #include <config.h>
#ifdef CONFIG_SK98
#include "h/skdrv1st.h" #include "h/skdrv1st.h"
#include "h/skdrv2nd.h" #include "h/skdrv2nd.h"
@ -2367,5 +2365,3 @@ int Port) /* Port to configure */
return(0); return(0);
} /* SkGeInitPort */ } /* SkGeInitPort */
#endif /* CONFIG_SK98 */

4
drivers/net/sk98lin/skgemib.c
View File

@ -52,8 +52,6 @@
#include <config.h> #include <config.h>
#ifdef CONFIG_SK98
/* /*
* PRIVATE OID handler function prototypes * PRIVATE OID handler function prototypes
*/ */
@ -1056,5 +1054,3 @@ PNMI_STATIC const SK_PNMI_TAB_ENTRY IdTable[] = {
0, 0,
SK_PNMI_RO, Vct, 0}, SK_PNMI_RO, Vct, 0},
}; };
#endif /* CONFIG_SK98 */

4
drivers/net/sk98lin/skgepnmi.c
View File

@ -434,8 +434,6 @@
#include <config.h> #include <config.h>
#ifdef CONFIG_SK98
static const char SysKonnectFileId[] = static const char SysKonnectFileId[] =
"@(#) $Id: skgepnmi.c,v 1.102 2002/12/16 14:03:24 tschilli Exp $" "@(#) $Id: skgepnmi.c,v 1.102 2002/12/16 14:03:24 tschilli Exp $"
" (C) SysKonnect."; " (C) SysKonnect.";
@ -8306,5 +8304,3 @@ SK_U32 PhysPortIndex)
} }
} /* CheckVctStatus */ } /* CheckVctStatus */
#endif /* CONFIG_SK98 */

4
drivers/net/sk98lin/skgesirq.c
View File

@ -339,8 +339,6 @@
#include <config.h> #include <config.h>
#ifdef CONFIG_SK98
/* /*
* Special Interrupt handler * Special Interrupt handler
* *
@ -2412,6 +2410,4 @@ SK_U16 IStatus) /* Interrupt Status */
} /* SkPhyIsrLone */ } /* SkPhyIsrLone */
#endif /* OTHER_PHY */ #endif /* OTHER_PHY */
#endif /* CONFIG_SK98 */
/* End of File */ /* End of File */

4
drivers/net/sk98lin/ski2c.c
View File

@ -230,8 +230,6 @@
#include <config.h> #include <config.h>
#ifdef CONFIG_SK98
/* /*
* I2C Protocol * I2C Protocol
*/ */
@ -1501,5 +1499,3 @@ SK_EVPARA Para) /* Event specific Parameter */
} /* SkI2cEvent*/ } /* SkI2cEvent*/
#endif /* !SK_DIAG */ #endif /* !SK_DIAG */
#endif /* CONFIG_SK98 */

4
drivers/net/sk98lin/sklm80.c
View File

@ -100,8 +100,6 @@
#include <config.h> #include <config.h>
#ifdef CONFIG_SK98
/* /*
LM80 functions LM80 functions
*/ */
@ -288,5 +286,3 @@ SK_SENSOR *pSen) /* Sensor to be read */
/* Not completed */ /* Not completed */
return(0); return(0);
} }
#endif /* CONFIG_SK98 */

4
drivers/net/sk98lin/skproc.c
View File

@ -72,8 +72,6 @@
#include <config.h> #include <config.h>
#ifdef CONFIG_SK98
#include <linux/proc_fs.h> #include <linux/proc_fs.h>
#include "h/skdrv1st.h" #include "h/skdrv1st.h"
@ -510,5 +508,3 @@ char * SkNumber(char * str, long long num, int base, int size, int precision
return strorg; return strorg;
} }
#endif /* CONFIG_SK98 */

4
drivers/net/sk98lin/skqueue.c
View File

@ -89,8 +89,6 @@
#include <config.h> #include <config.h>
#ifdef CONFIG_SK98
/* /*
Event queue and dispatcher Event queue and dispatcher
*/ */
@ -237,6 +235,4 @@ SK_IOC Ioc) /* Io context */
return(0) ; return(0) ;
} }
#endif /* CONFIG_SK98 */
/* End of file */ /* End of file */

4
drivers/net/sk98lin/skrlmt.c
View File

@ -282,8 +282,6 @@
#include <config.h> #include <config.h>
#ifdef CONFIG_SK98
#ifndef lint #ifndef lint
static const char SysKonnectFileId[] = static const char SysKonnectFileId[] =
"@(#) $Id: skrlmt.c,v 1.68 2003/01/31 15:26:56 rschmidt Exp $ (C) SysKonnect."; "@(#) $Id: skrlmt.c,v 1.68 2003/01/31 15:26:56 rschmidt Exp $ (C) SysKonnect.";
@ -3504,5 +3502,3 @@ SK_EVPARA Para) /* Event-specific parameter */
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif /* __cplusplus */ #endif /* __cplusplus */
#endif /* CONFIG_SK98 */

4
drivers/net/sk98lin/sktimer.c
View File

@ -74,8 +74,6 @@
#include <config.h> #include <config.h>
#ifdef CONFIG_SK98
/* /*
Event queue and dispatcher Event queue and dispatcher
*/ */
@ -292,6 +290,4 @@ int Restart) /* Do we need to restart the Hardware timer ? */
} }
} }
#endif /* CONFIG_SK98 */
/* End of file */ /* End of file */

4
drivers/net/sk98lin/skvpd.c
View File

@ -162,8 +162,6 @@
#include <config.h> #include <config.h>
#ifdef CONFIG_SK98
/* /*
Please refer skvpd.txt for infomation how to include this module Please refer skvpd.txt for infomation how to include this module
*/ */
@ -1325,5 +1323,3 @@ char *msg) /* error log message */
(void)VpdUpdate(pAC, IoC); (void)VpdUpdate(pAC, IoC);
} }
#endif /* CONFIG_SK98 */

4
drivers/net/sk98lin/skxmac2.c
View File

@ -412,8 +412,6 @@
#include <config.h> #include <config.h>
#ifdef CONFIG_SK98
#include "h/skdrv1st.h" #include "h/skdrv1st.h"
#include "h/skdrv2nd.h" #include "h/skdrv2nd.h"
@ -4391,6 +4389,4 @@ SK_BOOL StartTest) /* flag for start / get result */
return(0); return(0);
} /* SkGmCableDiagStatus */ } /* SkGmCableDiagStatus */
#endif /* CONFIG_SK98 */
/* End of file */ /* End of file */

6
drivers/net/sk98lin/uboot_drv.c
View File

@ -25,9 +25,6 @@
#include <common.h> #include <common.h>
#if defined(CONFIG_CMD_NET) && defined(CONFIG_NET_MULTI) && \
defined(CONFIG_SK98)
#include "h/skdrv1st.h" #include "h/skdrv1st.h"
#include "h/skdrv2nd.h" #include "h/skdrv2nd.h"
#include "u-boot_compat.h" #include "u-boot_compat.h"
@ -138,6 +135,3 @@ static int skge_recv(struct eth_device *dev)
return 0; return 0;
} }
#endif /* CONFIG_SK98 */

5
drivers/net/sk98lin/uboot_skb.c
View File

@ -24,9 +24,6 @@
*/ */
#include <config.h> #include <config.h>
#ifdef CONFIG_SK98
#include <common.h> #include <common.h>
#include "u-boot_compat.h" #include "u-boot_compat.h"
@ -118,5 +115,3 @@ void skb_put(struct sk_buff *skb, unsigned int len)
{ {
skb->len+=len; skb->len+=len;
} }
#endif /* CONFIG_SK98 */