diff options
| -rw-r--r-- | .hgignore | 5 | ||||
| -rw-r--r-- | config/StdGNU.mk | 1 | ||||
| -rw-r--r-- | config/SunOS.mk | 1 | ||||
| -rw-r--r-- | tools/firmware/etherboot/Makefile | 25 |
4 files changed, 29 insertions, 3 deletions
@@ -105,6 +105,9 @@ ^tools/firmware/.*\.bin$ ^tools/firmware/.*\.sym$ ^tools/firmware/.*bios/.*bios.*\.txt$ +^tools/firmware/etherboot/etherboot-5 +^tools/firmware/etherboot/etherboot-build +^tools/firmware/etherboot/.*\.zrom\.h$ ^tools/firmware/extboot/extboot.img$ ^tools/firmware/extboot/signrom$ ^tools/firmware/hvmloader/acpi/acpigen$ @@ -258,5 +261,3 @@ ^unmodified_drivers/linux-2.6/.*\.ko$ ^unmodified_drivers/linux-2.6/.*\.mod\.c$ ^LibVNCServer.* -^tools/firmware/etherboot/etherboot-build -^tools/firmware/etherboot/etherboot-5.* diff --git a/config/StdGNU.mk b/config/StdGNU.mk index a26ce17c84..dfbc7ece44 100644 --- a/config/StdGNU.mk +++ b/config/StdGNU.mk @@ -8,6 +8,7 @@ NM = $(CROSS_COMPILE)nm STRIP = $(CROSS_COMPILE)strip OBJCOPY = $(CROSS_COMPILE)objcopy OBJDUMP = $(CROSS_COMPILE)objdump +SIZEUTIL = $(CROSS_COMPILE)size MSGFMT = msgfmt MSGMERGE = msgmerge diff --git a/config/SunOS.mk b/config/SunOS.mk index d5eba747bf..e6035bf4ca 100644 --- a/config/SunOS.mk +++ b/config/SunOS.mk @@ -8,6 +8,7 @@ NM = $(CROSS_COMPILE)gnm STRIP = $(CROSS_COMPILE)gstrip OBJCOPY = $(CROSS_COMPILE)gobjcopy OBJDUMP = $(CROSS_COMPILE)gobjdump +SIZEUTIL = $(CROSS_COMPILE)gsize MSGFMT = gmsgfmt diff --git a/tools/firmware/etherboot/Makefile b/tools/firmware/etherboot/Makefile index 503d9a22b4..67776afbd7 100644 --- a/tools/firmware/etherboot/Makefile +++ b/tools/firmware/etherboot/Makefile @@ -1,6 +1,10 @@ EB_VERSION=5.4.2 +override XEN_TARGET_ARCH = x86_32 +XEN_ROOT = ../../.. +include $(XEN_ROOT)/tools/Rules.mk + D=etherboot-$(EB_VERSION) T=etherboot-$(EB_VERSION).tar.gz E=etherboot-build @@ -18,7 +22,26 @@ $E/src/Config: $T Config rm -rf $D $E tar zxf $T cat Config >>$D/src/Config - ./find-gcc-3 >>$D/src/Config + @ + # override many of the settings in Config + echo ARCH=i386 >>$D/src/Config + echo "HOST_CC=$(HOSTCC)" >>$D/src/Config + echo "CPP=$(CPP)" >>$D/src/Config + echo "CC=$(CC)" >>$D/src/Config + echo "AS=$(CC) -c -x assembler -" >>$D/src/Config + echo "LD=$(LD)" >>$D/src/Config + echo "SIZE=$(SIZE)" >>$D/src/Config + echo "AR=$(AR)" >>$D/src/Config + echo "RANLIB=$(RANLIB)" >>$D/src/Config + echo "OBJCOPY=$(OBJCOPY)" >>$D/src/Config + echo "CFLAGS+=$(CFLAGS)" >>$D/src/Config + echo "ASFLAGS+=$(CFLAGS)" >>$D/src/Config + echo "LDFLAGS+=$(LDFLAGS_DIRECT)" >>$D/src/Config + @ + set -e; cd $D/src/arch/i386; \ + sed -e '/ifneq.*GCC_MINORVERSION/,/endif/ s/^/#/' \ + Config >Config.new; \ + mv Config.new Config mv $D $E clean: |