diff options
| author | Keir Fraser <keir.fraser@citrix.com> | 2008-02-02 13:40:43 +0000 |
|---|---|---|
| committer | Keir Fraser <keir.fraser@citrix.com> | 2008-02-02 13:40:43 +0000 |
| commit | e1781903c71b6b2c84a2924bb63aeb918c983a34 (patch) | |
| tree | aca2dfb56d6e6f5e5b59d658ef2b8829b125d639 /tools | |
| parent | abae89340b4897f27a23006ba7fe48f54634be02 (diff) | |
| download | xen-e1781903c71b6b2c84a2924bb63aeb918c983a34.tar.gz xen-e1781903c71b6b2c84a2924bb63aeb918c983a34.tar.bz2 xen-e1781903c71b6b2c84a2924bb63aeb918c983a34.zip | |
Fix hvmloader makefile dependencies, and do not recurse into
tools/firmware/etherboot by default (the dependency of eb_roms.h on
Config does not seem to always prevent the build from going ahead, for
some reason).
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/firmware/Makefile | 2 | ||||
| -rw-r--r-- | tools/firmware/hvmloader/Makefile | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/firmware/Makefile b/tools/firmware/Makefile index 6f57cff07c..0ec31883fd 100644 --- a/tools/firmware/Makefile +++ b/tools/firmware/Makefile @@ -11,7 +11,7 @@ SUBDIRS += rombios rombios/32bit SUBDIRS += vgabios SUBDIRS += vmxassist SUBDIRS += extboot -SUBDIRS += etherboot +#SUBDIRS += etherboot SUBDIRS += hvmloader .PHONY: all diff --git a/tools/firmware/hvmloader/Makefile b/tools/firmware/hvmloader/Makefile index c2d8ecabad..f34bcb3880 100644 --- a/tools/firmware/hvmloader/Makefile +++ b/tools/firmware/hvmloader/Makefile @@ -50,7 +50,7 @@ hvmloader: roms.h acpi/acpi.a $(SRCS) 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-roms.h ../extboot/extboot.bin 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 |