Import of Linux/MIPS 1.3.0

1 files changed, 119 insertions, 29 deletions

diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 3df086130..53c2cfa0d 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -6,55 +6,63 @@
 # This will go away in some future future: hidden configuration files
 # are difficult for users to deal with.
 include CONFIG
-include MODULES
+
+# Build MODULES by appending to this string for every driver below
+MODULES :=
 
 NETDRV_OBJS := Space.o auto_irq.o net_init.o loopback.o
-CFLAGS := $(CFLAGS) -I../../net/inet
-CPP := $(CPP) -I../../net/inet
 
 .c.o:
 	$(CC) $(CFLAGS) -c $<
 
 
 # The point of the makefile...
-all: net.a modules
+all: net.a
 
 Space.o: Space.c ../../include/linux/autoconf.h
 	$(CC) $(CFLAGS) $(OPTS) -c $<
 
 net_init.o: ../../include/linux/autoconf.h
 
+ifdef CONFIG_IBMTR
+NETDRV_OBJS := $(NETDRV_OBJS) ibmtr.o
+endif
+
 ifdef CONFIG_SK_G16
 NETDRV_OBJS := $(NETDRV_OBJS) sk_g16.o
 endif
 
+ifdef CONFIG_NET_IPIP
+NETDRV_OBJS := $(NETDRV_OBJS) tunnel.o
+endif
+
 ifdef CONFIG_WD80x3
 NETDRV_OBJS := $(NETDRV_OBJS) wd.o
 CONFIG_8390 = CONFIG_8390
+endif
 wd.o:	wd.c CONFIG
 	$(CC) $(CPPFLAGS) $(CFLAGS) $(WD_OPTS) -c $<
-endif
 
 ifdef CONFIG_EL2
 NETDRV_OBJS := $(NETDRV_OBJS) 3c503.o
 CONFIG_8390 = CONFIG_8390
+endif
 3c503.o:	3c503.c CONFIG
 	$(CC) $(CPPFLAGS) $(CFLAGS) $(EL2_OPTS) -c $<
-endif
 
 ifdef CONFIG_NE2000
 NETDRV_OBJS := $(NETDRV_OBJS) ne.o
 CONFIG_8390 = CONFIG_8390
+endif
 ne.o:	ne.c CONFIG
 	$(CC) $(CPPFLAGS) $(CFLAGS) $(NE_OPTS) -c $<
-endif
 
 ifdef CONFIG_HPLAN
 NETDRV_OBJS := $(NETDRV_OBJS) hp.o
 CONFIG_8390 = CONFIG_8390
+endif
 hp.o:	hp.c CONFIG
 	$(CC) $(CPPFLAGS) $(CFLAGS) $(HP_OPTS) -c $<
-endif
 
 ifdef CONFIG_HPLAN_PLUS
 NETDRV_OBJS := $(NETDRV_OBJS) hp-plus.o
@@ -73,42 +81,57 @@ endif
 
 ifdef CONFIG_PLIP
 NETDRV_OBJS := $(NETDRV_OBJS) plip.o
+else
+MODULES := $(MODULES) plip.o
+endif
 plip.o:	plip.c CONFIG
 	$(CC) $(CPPFLAGS) $(CFLAGS) $(PLIP_OPTS) -c $<
-endif
 
 ifdef CONFIG_PPP
-NETDRV_OBJS := $(NETDRV_OBJS) ppp.o slhc.o
+NETDRV_OBJS := $(NETDRV_OBJS) ppp.o
+CONFIG_SLHC = CONFIG_SLHC
+else
+MODULES := $(MODULES) ppp.o
 endif
 
 ifdef CONFIG_SLIP
-NETDRV_OBJS := $(NETDRV_OBJS) slip.o slhc.o
+NETDRV_OBJS := $(NETDRV_OBJS) slip.o
+CONFIG_SLHC = CONFIG_SLHC
+else
+MODULES := $(MODULES) slip.o
+endif
 slip.o:	slip.c CONFIG
 	$(CC) $(CPPFLAGS) $(CFLAGS) -c $<
-endif
 
 ifdef CONFIG_DE650
 NETDRV_OBJS := $(NETDRV_OBJS) de650.o
 CONFIG_8390 = CONFIG_8390
 endif
+
 ifdef CONFIG_3C589
 NETDRV_OBJS := $(NETDRV_OBJS) 3c589.o
 endif
 
 ifdef CONFIG_DUMMY
 NETDRV_OBJS := $(NETDRV_OBJS) dummy.o
+else
+MODULES := $(MODULES) dummy.o
+endif
 dummy.o: dummy.c CONFIG
 	$(CC) $(CPPFLAGS) $(CFLAGS) -c $<
-endif
 
 ifdef CONFIG_DE600
 NETDRV_OBJS := $(NETDRV_OBJS) de600.o
+else
+MODULES := $(MODULES) de600.o
 endif
 de600.o: de600.c CONFIG
 	$(CC) $(CPPFLAGS) $(CFLAGS) $(DE600_OPTS) -c $<
 	
 ifdef CONFIG_DE620
 NETDRV_OBJS := $(NETDRV_OBJS) de620.o
+else
+MODULES := $(MODULES) de620.o
 endif
 de620.o: de620.c CONFIG
 	$(CC) $(CPPFLAGS) $(CFLAGS) $(DE620_OPTS) -c $<
@@ -116,93 +139,160 @@ de620.o: de620.c CONFIG
 ifdef CONFIG_AT1500
 NETDRV_OBJS := $(NETDRV_OBJS) lance.o
 endif
+
 ifdef CONFIG_LANCE
 NETDRV_OBJS := $(NETDRV_OBJS) lance.o
 endif
+
 ifdef CONFIG_AT1700
 NETDRV_OBJS := $(NETDRV_OBJS) at1700.o
 endif
+
 ifdef CONFIG_EL1
 NETDRV_OBJS := $(NETDRV_OBJS) 3c501.o
+else
+MODULES := $(MODULES) 3c501.o
 endif
+
 ifdef CONFIG_EL16
 NETDRV_OBJS := $(NETDRV_OBJS) 3c507.o
 endif
+
 ifdef CONFIG_EL3
 NETDRV_OBJS := $(NETDRV_OBJS) 3c509.o
+else
+MODULES := $(MODULES) 3c509.o
 endif
+
 ifdef CONFIG_EEXPRESS
 NETDRV_OBJS := $(NETDRV_OBJS) eexpress.o
+else
+MODULES := $(MODULES) eexpress.o
 endif
+
+ifdef CONFIG_WAVELAN
+NETDRV_OBJS := $(NETDRV_OBJS) wavelan.o
+else
+MODULES := $(MODULES) wavelan.o
+endif
+
 ifdef CONFIG_ZNET
 NETDRV_OBJS := $(NETDRV_OBJS) znet.o
 endif
+
 ifdef CONFIG_DEPCA
 NETDRV_OBJS := $(NETDRV_OBJS) depca.o
+else
+MODULES := $(MODULES) depca.o
+endif
 depca.o: depca.c CONFIG
 	$(CC) $(CPPFLAGS) $(CFLAGS) $(DEPCA_OPTS) -c $<
-endif
+
 ifdef CONFIG_EWRK3
 NETDRV_OBJS := $(NETDRV_OBJS) ewrk3.o
+else
+MODULES := $(MODULES) ewrk3.o
+endif
 ewrk3.o: ewrk3.c CONFIG
 	$(CC) $(CPPFLAGS) $(CFLAGS) $(EWRK3_OPTS) -c $<
-endif
+
 ifdef CONFIG_ATP
 NETDRV_OBJS := $(NETDRV_OBJS) atp.o
 endif
+
+ifdef CONFIG_DE4X5
+NETDRV_OBJS := $(NETDRV_OBJS) de4x5.o
+else
+MODULES := $(MODULES) de4x5.o
+endif
+de4x5.o: de4x5.c CONFIG
+	$(CC) $(CPPFLAGS) $(CFLAGS) $(DE4x5_OPTS) -c $<
+
 ifdef CONFIG_NI52
 NETDRV_OBJS := $(NETDRV_OBJS) ni52.o
 endif
+
 ifdef CONFIG_NI65
 NETDRV_OBJS := $(NETDRV_OBJS) ni65.o
 endif
+
 ifdef CONFIG_ELPLUS
 NETDRV_OBJS := $(NETDRV_OBJS) 3c505.o
 endif
+3c505.o: 3c505.c CONFIG
+	$(CC) $(CPPFLAGS) $(CFLAGS) $(ELP_OPTS) -c $<
+
 ifdef CONFIG_AC3200
 NETDRV_OBJS := $(NETDRV_OBJS) ac3200.o
 CONFIG_8390 = CONFIG_8390
 endif
+
 ifdef CONFIG_APRICOT
 NETDRV_OBJS := $(NETDRV_OBJS) apricot.o
+else
+MODULES := $(MODULES) apricot.o
 endif
 
-ifdef CONFIG_8390
-NETDRV_OBJS := $(NETDRV_OBJS) 8390.o
+ifdef CONFIG_DEC_ELCP
+NETDRV_OBJS := $(NETDRV_OBJS) tulip.o
+endif
+
+ifdef CONFIG_ARCNET
+NETDRV_OBJS := $(NETDRV_OBJS) arcnet.o
+else
+MODULES := $(MODULES) arcnet.o
 endif
 
 ifdef CONFIG_PI
 NETDRV_OBJS := $(NETDRV_OBJS) pi2.o
 CONFIG_PI = CONFIG_PI
+endif
 pi2.o:  pi2.c CONFIG
 	$(CC) $(CPPFLAGS) $(CFLAGS) $(PI_OPTS) -c $<
+
+ifdef CONFIG_SLHC
+NETDRV_OBJS := $(NETDRV_OBJS) slhc.o
+else
+MODULES := slhc.o $(MODULES)
+endif
+
+ifdef CONFIG_8390
+NETDRV_OBJS := $(NETDRV_OBJS) 8390.o
+else
+MODULES := 8390.o $(MODULES)
+endif
+
+ifdef CONFIG_EQUALIZER
+NETDRV_OBJS := $(NETDRV_OBJS) eql.o
+endif
+
+ifdef CONFIG_MIPS_JAZZ_SONIC
+NETDRV_OBJS := $(NETDRV_OBJS) sonic.o
+else
+MODULES := sonic.o $(MODULES)
 endif
 
 net.a: $(NETDRV_OBJS)
 	rm -f net.a
-	ar rc net.a $(NETDRV_OBJS)
-	ranlib net.a
+	$(AR) rcs net.a $(NETDRV_OBJS)
 
 clean:
 	rm -f core *.o *.a *.s
 
 dep:
-	$(CPP) -M *.c > .depend
+	$(CPP) -M $(NETDRV_OBJS:.o=.c) > .depend
+ifdef MODULES
+	$(CPP) -M -DMODULE $(MODULES:.o=.c) >> .depend
+endif
 
 tar:
 
 ifdef MODULES
 
-modules:
+modules: $(MODULES)
 	echo $(MODULES) > ../../modules/NET_MODULES
-	@(cd ../../modules; \
-		for i in $(MODULES:.o=.c); \
-			do ln -sf ../drivers/net/$$i .; \
-			done ; \
-		ln -sf ../drivers/net/CONFIG . ; \
-		$(MAKE) -f../drivers/net/Makefile -I../drivers/net \
-			CFLAGS="$(CFLAGS) -I../net/inet -I../drivers/net -DMODULE" $(MODULES); \
-		rm $(MODULES:.o=.c) CONFIG)
+	cd ../../modules; \
+		for i in $(MODULES); do ln -sf ../drivers/net/$$i .; done
 
 else