1.1 --- a/.hgignore	Thu Jan 31 13:01:08 2008 +0000
     1.2 +++ b/.hgignore	Thu Jan 31 14:01:59 2008 +0000
     1.3 @@ -105,6 +105,9 @@
     1.4  ^tools/firmware/.*\.bin$
     1.5  ^tools/firmware/.*\.sym$
     1.6  ^tools/firmware/.*bios/.*bios.*\.txt$
     1.7 +^tools/firmware/etherboot/etherboot-5
     1.8 +^tools/firmware/etherboot/etherboot-build
     1.9 +^tools/firmware/etherboot/.*\.zrom\.h$
    1.10  ^tools/firmware/extboot/extboot.img$
    1.11  ^tools/firmware/extboot/signrom$
    1.12  ^tools/firmware/hvmloader/acpi/acpigen$
    1.13 @@ -258,5 +261,3 @@
    1.14  ^unmodified_drivers/linux-2.6/.*\.ko$
    1.15  ^unmodified_drivers/linux-2.6/.*\.mod\.c$
    1.16  ^LibVNCServer.*
    1.17 -^tools/firmware/etherboot/etherboot-build
    1.18 -^tools/firmware/etherboot/etherboot-5.*

     2.1 --- a/config/StdGNU.mk	Thu Jan 31 13:01:08 2008 +0000
     2.2 +++ b/config/StdGNU.mk	Thu Jan 31 14:01:59 2008 +0000
     2.3 @@ -8,6 +8,7 @@ NM         = $(CROSS_COMPILE)nm
     2.4  STRIP      = $(CROSS_COMPILE)strip
     2.5  OBJCOPY    = $(CROSS_COMPILE)objcopy
     2.6  OBJDUMP    = $(CROSS_COMPILE)objdump
     2.7 +SIZEUTIL   = $(CROSS_COMPILE)size
     2.8  
     2.9  MSGFMT     = msgfmt
    2.10  MSGMERGE   = msgmerge

     3.1 --- a/config/SunOS.mk	Thu Jan 31 13:01:08 2008 +0000
     3.2 +++ b/config/SunOS.mk	Thu Jan 31 14:01:59 2008 +0000
     3.3 @@ -8,6 +8,7 @@ NM         = $(CROSS_COMPILE)gnm
     3.4  STRIP      = $(CROSS_COMPILE)gstrip
     3.5  OBJCOPY    = $(CROSS_COMPILE)gobjcopy
     3.6  OBJDUMP    = $(CROSS_COMPILE)gobjdump
     3.7 +SIZEUTIL   = $(CROSS_COMPILE)gsize
     3.8  
     3.9  MSGFMT     = gmsgfmt
    3.10  

     4.1 --- a/tools/firmware/etherboot/Makefile	Thu Jan 31 13:01:08 2008 +0000
     4.2 +++ b/tools/firmware/etherboot/Makefile	Thu Jan 31 14:01:59 2008 +0000
     4.3 @@ -1,6 +1,10 @@
     4.4  
     4.5  EB_VERSION=5.4.2
     4.6  
     4.7 +override XEN_TARGET_ARCH = x86_32
     4.8 +XEN_ROOT = ../../..
     4.9 +include $(XEN_ROOT)/tools/Rules.mk
    4.10 +
    4.11  D=etherboot-$(EB_VERSION)
    4.12  T=etherboot-$(EB_VERSION).tar.gz
    4.13  E=etherboot-build
    4.14 @@ -18,7 +22,26 @@ eb-%.zrom.h: $E/src/Config
    4.15  	rm -rf $D $E
    4.16  	tar zxf $T
    4.17  	cat Config >>$D/src/Config
    4.18 -	./find-gcc-3 >>$D/src/Config
    4.19 +	@
    4.20 +	# override many of the settings in Config
    4.21 +	echo ARCH=i386 >>$D/src/Config
    4.22 +	echo "HOST_CC=$(HOSTCC)" >>$D/src/Config
    4.23 +	echo "CPP=$(CPP)" >>$D/src/Config
    4.24 +	echo "CC=$(CC)" >>$D/src/Config
    4.25 +	echo "AS=$(CC) -c -x assembler -" >>$D/src/Config
    4.26 +	echo "LD=$(LD)" >>$D/src/Config
    4.27 +	echo "SIZE=$(SIZE)" >>$D/src/Config
    4.28 +	echo "AR=$(AR)" >>$D/src/Config
    4.29 +	echo "RANLIB=$(RANLIB)" >>$D/src/Config
    4.30 +	echo "OBJCOPY=$(OBJCOPY)" >>$D/src/Config
    4.31 +	echo "CFLAGS+=$(CFLAGS)" >>$D/src/Config
    4.32 +	echo "ASFLAGS+=$(CFLAGS)" >>$D/src/Config
    4.33 +	echo "LDFLAGS+=$(LDFLAGS_DIRECT)" >>$D/src/Config
    4.34 +	@
    4.35 +	set -e; cd $D/src/arch/i386; \
    4.36 +		sed -e '/ifneq.*GCC_MINORVERSION/,/endif/ s/^/#/' \
    4.37 +			Config >Config.new; \
    4.38 +		mv Config.new Config
    4.39  	mv $D $E
    4.40  
    4.41  clean: