Etherboot for E100 NIC

diff -r afa521cf82e6 -r 49e3c23a466f tools/firmware/etherboot/README
@@ -1,11 +1,17 @@
 
-This is an Etherboot option ROM for the rtl8139 NIC.  It has a few
-non-standard settings, most to do with timeouts and when to give up,
+These are Etherboot option ROMs for the e100 and the rtl8139 NIC.  They have
+a few non-standard settings, most to do with timeouts and when to give up,
 and for stricter DHCP spec compliance.
 
-Rom-o-matic.net will provide this image at the following URL:
+Rom-o-matic.net will provide these images at the following URLs:
+
+e100:
+
+http://rom-o-matic.net/5.4.3/build.php?version=5.4.3&F=ignore&nic=eepro100%3Aeepro100+--+%5B0x8086%2C0x1229%5D&ofmt=Binary+ROM+Image%28.zrom%29&arch=i386&ASK_BOOT=-1&BOOT_FIRST=BOOT_NIC&BOOT_SECOND=BOOT_NOTHING&BOOT_THIRD=BOOT_NOTHING&BOOT_INDEX=0&STATIC_CLIENT_IP=&STATIC_SUBNET_MASK=&STATIC_SERVER_IP=&STATIC_GATEWAY_IP=&STATIC_BOOTFILE=&EXIT_ON_FILE_LOAD_ERROR=on&DHCP_CLIENT_ID=&DHCP_CLIENT_ID_LEN=&DHCP_CLIENT_ID_TYPE=&DHCP_USER_CLASS=&DHCP_USER_CLASS_LEN=&ALLOW_ONLY_ENCAPSULATED=on&DEFAULT_BOOTFILE=&CONGESTED=on&BACKOFF_LIMIT=7&TIMEOUT=180&TRY_FLOPPY_FIRST=0&EXIT_IF_NO_OFFER=on&TAGGED_IMAGE=on&ELF_IMAGE=on&PXE_IMAGE=on&DOWNLOAD_PROTO_TFTP=on&COMCONSOLE=0x3F8&CONSPEED=9600&COMPARM=0x03&PXE_EXPORT=on&CONFIG_PCI=on&CONFIG_ISA=on&BUILD_ID=&PCBIOS=on&PXE_DHCP_STRICT=on&A=Get+ROM
+
+rtl8139:
 
 http://rom-o-matic.net/5.4.3/build.php?version=5.4.3&F=ignore&nic=rtl8139%3Artl8139+--+%5B0x10ec%2C0x8139%5D&ofmt=Binary+ROM+Image%28.zrom%29&arch=i386&ASK_BOOT=-1&BOOT_FIRST=BOOT_NIC&BOOT_SECOND=BOOT_NOTHING&BOOT_THIRD=BOOT_NOTHING&BOOT_INDEX=0&STATIC_CLIENT_IP=&STATIC_SUBNET_MASK=&STATIC_SERVER_IP=&STATIC_GATEWAY_IP=&STATIC_BOOTFILE=&EXIT_ON_FILE_LOAD_ERROR=on&DHCP_CLIENT_ID=&DHCP_CLIENT_ID_LEN=&DHCP_CLIENT_ID_TYPE=&DHCP_USER_CLASS=&DHCP_USER_CLASS_LEN=&ALLOW_ONLY_ENCAPSULATED=on&DEFAULT_BOOTFILE=&CONGESTED=on&BACKOFF_LIMIT=7&TIMEOUT=180&TRY_FLOPPY_FIRST=0&EXIT_IF_NO_OFFER=on&TAGGED_IMAGE=on&ELF_IMAGE=on&PXE_IMAGE=on&DOWNLOAD_PROTO_TFTP=on&COMCONSOLE=0x3F8&CONSPEED=9600&COMPARM=0x03&PXE_EXPORT=on&CONFIG_PCI=on&CONFIG_ISA=on&BUILD_ID=&PCBIOS=on&PXE_DHCP_STRICT=on&A=Get+ROM
 
 and the mkhex script in tools/firmware/hvmloader will make the header 
-file from the downloaded image.
+files from the downloaded images.

diff -r afa521cf82e6 -r 49e3c23a466f tools/firmware/hvmloader/Makefile
@@ -49,11 +49,12 @@ acpi/acpi.a:
 acpi/acpi.a:
 	$(MAKE) -C acpi
 
-roms.h:	../rombios/BIOS-bochs-latest ../vgabios/VGABIOS-lgpl-latest.bin ../vgabios/VGABIOS-lgpl-latest.cirrus.bin ../vmxassist/vmxassist.bin ../etherboot/eb-rtl8139.zrom.h
+roms.h:	../rombios/BIOS-bochs-latest ../vgabios/VGABIOS-lgpl-latest.bin ../vgabios/VGABIOS-lgpl-latest.cirrus.bin ../vmxassist/vmxassist.bin ../etherboot/eb-e100.zrom.h ../etherboot/eb-rtl8139.zrom.h
 	sh ./mkhex rombios ../rombios/BIOS-bochs-latest > roms.h
 	sh ./mkhex vgabios_stdvga ../vgabios/VGABIOS-lgpl-latest.bin >> roms.h
 	sh ./mkhex vgabios_cirrusvga ../vgabios/VGABIOS-lgpl-latest.cirrus.bin >> roms.h
 	sh ./mkhex vmxassist ../vmxassist/vmxassist.bin >> roms.h
+	cat ../etherboot/eb-e100.zrom.h >> roms.h
 	cat ../etherboot/eb-rtl8139.zrom.h >> roms.h
 	sh ./mkhex extboot ../extboot/extboot.bin >> roms.h
 

diff -r 71e9c5d41023 .hgignore
@@ -105,6 +105,8 @@
 ^tools/firmware/.*\.bin$
 ^tools/firmware/.*\.sym$
 ^tools/firmware/.*bios/.*bios.*\.txt$
+^tools/firmware/etherboot/eb-roms\.h$
+^tools/firmware/etherboot/eb-rom-list\.h$
 ^tools/firmware/etherboot/etherboot-5
 ^tools/firmware/etherboot/etherboot-build
 ^tools/firmware/etherboot/.*\.zrom\.h$

diff -r 71e9c5d41023 tools/firmware/etherboot/Makefile
@@ -9,14 +9,24 @@ T=etherboot-$(EB_VERSION).tar.gz
 T=etherboot-$(EB_VERSION).tar.gz
 E=etherboot-build
 
-TARGETS=eb-rtl8139.zrom.h
+NICS =	rtl8139 eepro100
+
+TARGETS= eb-rom-list.h eb-roms.h $(ROM_ZHS)
+
+ROM_ZHS= $(addprefix eb-, $(addsuffix .zrom.h, $(NICS)))
 
 all: $(TARGETS)
 
 eb-%.zrom.h: $E/src/Config
 	$(MAKE) -C $E/src bin/$*.zrom
-	../hvmloader/mkhex etherboot <$E/src/bin/$*.zrom >[email protected]
+	../hvmloader/mkhex etherboot_$* <$E/src/bin/$*.zrom >[email protected]
 	mv -f [email protected] $@
+
+eb-rom-list.h: make-eb-rom-list $E/src/bin/Roms
+	./$^ $(NICS) >[email protected] && mv -f [email protected] $@
+
+eb-roms.h: eb-rom-list.h $(ROM_ZHS)
+	cat $^ >[email protected] && mv -f [email protected] $@
 
 $E/src/Config:	$T Config
 	rm -rf $D $E

@@ -44,7 +54,10 @@ eb-%.zrom.h: $E/src/Config
 		mv Config.new Config
 	mv $D $E
 
+$E/src/bin/Roms: $E/src/Config
+	$(MAKE) -C $E/src bin/Roms
+
 clean:
-	rm -rf $D $E *.zrom.h *~
+	rm -rf $D $E *.zrom.h $(TARGETS) *~
 
 .PHONY: all clean

diff -r 71e9c5d41023 tools/firmware/hvmloader/Makefile
@@ -55,7 +55,7 @@ roms.h:	../rombios/BIOS-bochs-latest ../
 	sh ./mkhex vgabios_stdvga ../vgabios/VGABIOS-lgpl-latest.bin >> roms.h
 	sh ./mkhex vgabios_cirrusvga ../vgabios/VGABIOS-lgpl-latest.cirrus.bin >> roms.h
 	sh ./mkhex vmxassist ../vmxassist/vmxassist.bin >> roms.h
-	cat ../etherboot/eb-rtl8139.zrom.h >> roms.h
+	cat ../etherboot/eb-roms.h >> roms.h
 	sh ./mkhex extboot ../extboot/extboot.bin >> roms.h
 
 .PHONY: clean

diff -r 71e9c5d41023 tools/firmware/etherboot/make-eb-rom-list
@@ -0,0 +1,11 @@
+#!/bin/sh
+set -e
+roms=$1; shift
+echo "/* autogenerated - do not edit */"
+echo "#define ETHERBOOT_ROM_LIST \\"
+for nic in "$@"; do
+	makerom=`grep "^MAKEROM_ID_$nic *= *-p *" <$roms`
+	echo "  ETHERBOOT_ROM($nic,${makerom#*-p}) \\"
+done
+echo
+echo "/*end.*/"

diff -r d29d74d4eeac tools/firmware/etherboot/Config
@@ -10,4 +10,6 @@ CFLAGS+=	-UPXE_DHCP_STRICT
 CFLAGS+=	-UPXE_DHCP_STRICT
 CFLAGS+=	-DPXE_DHCP_STRICT
 
+CFLAGS+=	-fno-stack-protector
+
 # Also, the Makefile arranges for us to use GCC 3