From e1781903c71b6b2c84a2924bb63aeb918c983a34 Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Sat, 2 Feb 2008 13:40:43 +0000 Subject: 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 --- tools/firmware/Makefile | 2 +- tools/firmware/hvmloader/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'tools') 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 -- cgit v1.2.3