diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2013-09-20 15:26:26 +0200 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2013-09-30 09:44:35 +0200 |
| commit | 46ef7f33a200a903dfcf7174ef5db4a09dc84f06 (patch) | |
| tree | 77a525fe7abe518c5db14b29066395b47adf5462 | |
| parent | 5a7bd33385f25ccd09725899b380e0c62f6d5733 (diff) | |
| download | focaccia-qemu-46ef7f33a200a903dfcf7174ef5db4a09dc84f06.tar.gz focaccia-qemu-46ef7f33a200a903dfcf7174ef5db4a09dc84f06.zip | |
roms: parallel ipxe builds
Enable parallel ipxe builds. Reduce the recursive make calls. Call recursive make properly using $(MAKE) $(MAKEFLAGS). Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
| -rw-r--r-- | roms/Makefile | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/roms/Makefile b/roms/Makefile index 11d783711c..9672625a99 100644 --- a/roms/Makefile +++ b/roms/Makefile @@ -2,6 +2,7 @@ vgabios_variants := stdvga cirrus vmware qxl isavga vgabios_targets := $(subst -isavga,,$(patsubst %,vgabios-%.bin,$(vgabios_variants))) pxerom_variants := e1000 eepro100 ne2k_pci pcnet rtl8139 virtio +pxerom_targets := 8086100e 80861209 10500940 10222000 10ec8139 1af41000 pxe-rom-e1000 efi-rom-e1000 : VID := 8086 pxe-rom-e1000 efi-rom-e1000 : DID := 100e @@ -64,22 +65,27 @@ build-lgplvgabios: pxerom: $(patsubst %,pxe-rom-%,$(pxerom_variants)) -pxe-rom-%: ipxe/src/config/local/general.h - make -C ipxe/src bin/$(VID)$(DID).rom +pxe-rom-%: build-pxe-roms cp ipxe/src/bin/$(VID)$(DID).rom ../pc-bios/pxe-$*.rom efirom: $(patsubst %,efi-rom-%,$(pxerom_variants)) -efi-rom-%: ipxe/src/config/local/general.h - make -C ipxe/src bin/$(VID)$(DID).rom - make -C ipxe/src bin-i386-efi/$(VID)$(DID).efidrv - make -C ipxe/src bin-x86_64-efi/$(VID)$(DID).efidrv +efi-rom-%: build-pxe-roms build-efi-roms $(EFIROM) -f "0x$(VID)" -i "0x$(DID)" -l 0x02 \ -b ipxe/src/bin/$(VID)$(DID).rom \ -ec ipxe/src/bin-i386-efi/$(VID)$(DID).efidrv \ -ec ipxe/src/bin-x86_64-efi/$(VID)$(DID).efidrv \ -o ../pc-bios/efi-$*.rom +build-pxe-roms: ipxe/src/config/local/general.h + $(MAKE) $(MAKEFLAGS) -C ipxe/src GITVERSION="" \ + $(patsubst %,bin/%.rom,$(pxerom_targets)) + +build-efi-roms: build-pxe-roms ipxe/src/config/local/general.h + $(MAKE) $(MAKEFLAGS) -C ipxe/src GITVERSION="" \ + $(patsubst %,bin-i386-efi/%.efidrv,$(pxerom_targets)) \ + $(patsubst %,bin-x86_64-efi/%.efidrv,$(pxerom_targets)) + ipxe/src/config/local/%: config.ipxe.% cp $< $@ |