wok-current diff etherboot/stuff/etherboot-net.u @ rev 7752
Up: parcellite to 0.9.3.
author | Christopher Rogers <slaxemulator@gmail.com> |
---|---|
date | Mon Dec 20 23:30:17 2010 +0000 (2010-12-20) |
parents | |
children |
line diff
1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 1.2 +++ b/etherboot/stuff/etherboot-net.u Mon Dec 20 23:30:17 2010 +0000 1.3 @@ -0,0 +1,46 @@ 1.4 +Patch from network_boot_floppy+cd+hd_540.zip at http://sourceforge.net/projects/thinstation 1.5 +--- etherboot-5.4.3/src/Makefile.main 2007-02-24 15:44:59.000000000 +0100 1.6 ++++ etherboot-5.4.3/src/Makefile.main 2008-04-08 15:06:47.000000000 +0200 1.7 +@@ -382,6 +382,27 @@ 1.8 + $(BIN)/%.zbin: $(BIN)/%.bin $(BIN)/nrv2b $(MAKEDEPS) 1.9 + $(BIN)/nrv2b e $< $@ 1.10 + 1.11 ++# Rule for the multi-NIC image. (by Paolo Salvan) 1.12 ++NETOBJS:= 1.13 ++# Note: the 3c90x.o driver should be linked BEFORE the 3c595.o 1.14 ++# otherwise 3c905b cards will be (badly) handled by the 3c595 driver as 3c900b cards 1.15 ++NETOBJS+= $(BIN)/3c90x.o 1.16 ++# PCI cards... 1.17 ++NETOBJS+= $(BIN)/3c595.o $(BIN)/davicom.o $(BIN)/eepro100.o $(BIN)/ns8390.o $(BIN)/pcnet32.o $(BIN)/prism2_plx.o $(BIN)/rtl8139.o $(BIN)/sis900.o $(BIN)/tulip.o $(BIN)/via-rhine.o $(BIN)/r8169.o $(BIN)/forcedeth.o $(BIN)/ns83820.o $(BIN)/eepro.o $(BIN)/e1000.o 1.18 ++# ISA cards... 1.19 ++NETOBJS+= $(BIN)/3c503.o $(BIN)/ne.o $(BIN)/wd.o $(BIN)/3c529.o $(BIN)/3c509.o 1.20 ++# Exclude these drivers + the belows to create the .COM image, max 65280 byte... 1.21 ++NETOBJS+= $(BIN)/sk_g16.o $(BIN)/depca.o $(BIN)/cs89x0.o $(BIN)/prism2_pci.o $(BIN)/smc9000.o $(BIN)/natsemi.o $(BIN)/epic100.o $(BIN)/sundance.o $(BIN)/w89c840.o $(BIN)/tlan.o 1.22 ++# Try excluding this big and rarely-used driver if you get "ERROR: code size exceeds limit!" at build-time 1.23 ++# or system resets/hungs-up during image decompression at run-time 1.24 ++# (uncompressed image could have exceeded low-memory...) 1.25 ++NETOBJS+= $(BIN)/tg3.o 1.26 ++# This driver has slow autoprobing and is rarely used, so it is better to exclude it... 1.27 ++#NETOBJS+= $(BIN)/3c515.o 1.28 ++ 1.29 ++$(BIN)/etherboot-net.o: $(NETOBJS) 1.30 ++ $(LD) -r $(NETOBJS) -o $@ 1.31 ++ 1.32 + # Housekeeping 1.33 + 1.34 + clean: 1.35 + 1.36 +--- etherboot-5.4.3/src/core/main.c 2007-02-24 15:44:59.000000000 +0100 1.37 ++++ etherboot-5.4.3/src/core/main.c 2008-04-08 15:11:46.000000000 +0200 1.38 +@@ -471,6 +471,11 @@ 1.39 + #ifdef DNS_RESOLVER 1.40 + const char *resolvt; 1.41 + #endif 1.42 ++ char *name_tmp = fname; 1.43 ++ while ( *name_tmp != 0 ) { 1.44 ++ if ( memcmp(name_tmp, ".zpxe", 6 ) == 0 ) {*name_tmp=0;} else {++name_tmp;} 1.45 ++ } 1.46 ++ 1.47 + ip.s_addr = arptable[ARP_SERVER].ipaddr.s_addr; 1.48 + name = fname; 1.49 + url_port = -1;