Index: etherboot-5.4.3/src/Config
===================================================================
--- etherboot-5.4.3.orig/src/Config	2008-07-07 15:57:50.000000000 -0700
+++ etherboot-5.4.3/src/Config	2008-07-07 15:59:39.000000000 -0700
@@ -327,11 +327,14 @@
 # CFLAGS+=	-DCONFIG_PCMCIA
 
 # For prompting and default on timeout
-CFLAGS+=	-DASK_BOOT=3 -DBOOT_FIRST=BOOT_NIC
+CFLAGS+=	-DASK_BOOT=-1 -DBOOT_FIRST=BOOT_NIC
 # If you would like to attempt to boot from other devices as well as the network.
 # CFLAGS+=	-DBOOT_SECOND=BOOT_FLOPPY
 # CFLAGS+=	-DBOOT_THIRD=BOOT_DISK
 # CFLAGS+=	-DBOOT_INDEX=0
+CFLAGS+=	-DBOOT_SECOND=BOOT_NOTHING
+CFLAGS+=	-DBOOT_THIRD=BOOT_NOTHING
+CFLAGS+=	-DBOOT_INDEX=0
 
 # If you prefer the old style rotating bar progress display
 # CFLAGS+=	-DBAR_PROGRESS
@@ -428,18 +431,19 @@
 # CFLAGS+=	-DDEFAULT_BOOTFILE=\"tftp://192.168.1.254/lts/pxelinux.0\"
 
 # Exit if there is an error loading the boot file
-# CFLAGS+=	-DEXIT_ON_FILE_LOAD_ERROR
+CFLAGS+=	-DEXIT_ON_FILE_LOAD_ERROR
 
 # Limit the delay on packet loss/congestion to a more bearable value. See
 # description above.  If unset, do not limit the delay between resend.
-CFLAGS+=	-DBACKOFF_LIMIT=7 -DCONGESTED
+CFLAGS+=	-DBACKOFF_LIMIT=6 -DCONGESTED
 
 # More optional features
-# CFLAGS+=	-DTRY_FLOPPY_FIRST=4
-# CFLAGS+=	-DEXIT_IF_NO_OFFER
+CFLAGS+=	-DTRY_FLOPPY_FIRST=0
+CFLAGS+=	-DEXIT_IF_NO_OFFER
 
 # For a serial console, which can run in parallel with FIRMWARE console
-# CFLAGS+=	-DCONSOLE_DUAL -DCOMCONSOLE=0x3F8 -DCONSPEED=9600
+CFLAGS+=	-DCONSOLE_DUAL -DCOMCONSOLE=0x3F8
+CFLAGS+=	-DCOMPRESERVE
 
 # Enable tagged image, generic ELF, Multiboot ELF
 # or FreeBSD ELF/a.out boot image support
@@ -469,7 +473,7 @@
 # (Requires TFTP protocol support)
 CFLAGS+=	-DPXE_IMAGE -DPXE_EXPORT
 # Etherboot stricter as a PXE network protocol ROM
-# CFLAGS+=	-DPXE_DHCP_STRICT
+CFLAGS+=	-DPXE_DHCP_STRICT
 
 # Support for PXE emulation. Works only with FreeBSD to load the kernel
 # via pxeboot, use only with DOWNLOAD_PROTO_NFS
@@ -486,12 +490,12 @@
 # CFLAGS+=	-DNORELOCATE
 
 # you should normally not need to change these
-HOST_CC=	gcc
-CPP=		gcc -E -Wp,-Wall
+HOST_CC=	gcc34
+CPP=		gcc34 -E -Wp,-Wall
 RM=		rm -f
 TOUCH=		touch
 PERL=		/usr/bin/perl
-CC=		gcc
+CC=		gcc34
 AS=		as
 LD=		ld
 SIZE=		size
Index: etherboot-5.4.3/src/arch/i386/Makefile
===================================================================
--- etherboot-5.4.3.orig/src/arch/i386/Makefile	2008-07-07 15:57:50.000000000 -0700
+++ etherboot-5.4.3/src/arch/i386/Makefile	2008-07-07 15:59:25.000000000 -0700
@@ -64,6 +64,7 @@
 TARGETBASE=$(basename $(notdir $@))
 ROMCARD=$(firstword $(subst --, ,$(TARGETBASE)))
 ROMTYPE=$(firstword $(ROMTYPE_$(ROMCARD)) ISA)
+ROMTYPE=PCI
 romENTRY=$($(ROMTYPE)ENTRY)
 romEXIT=$($(ROMTYPE)EXIT)
 
