diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2013-09-24 15:38:28 +0200 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2013-09-30 09:44:35 +0200 |
| commit | 95f7c6803c71ca6f74e8d59da3fd189230d1c466 (patch) | |
| tree | c586075aa9e67cb051699363e4ea11e9662843ed | |
| parent | 779fa9d7060c547059ff1993dd38bea565d7f2e7 (diff) | |
| download | qemu-95f7c6803c71ca6f74e8d59da3fd189230d1c466.zip | |
roms: enable parallel seabios / seavgabios builds
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
| -rw-r--r-- | roms/Makefile | 29 | ||||
| -rw-r--r-- | roms/config.vga-cirrus (renamed from roms/config.vga.cirrus) | 0 | ||||
| -rw-r--r-- | roms/config.vga-isavga (renamed from roms/config.vga.isavga) | 0 | ||||
| -rw-r--r-- | roms/config.vga-qxl (renamed from roms/config.vga.qxl) | 0 | ||||
| -rw-r--r-- | roms/config.vga-stdvga (renamed from roms/config.vga.stdvga) | 0 | ||||
| -rw-r--r-- | roms/config.vga-vmware (renamed from roms/config.vga.vmware) | 0 |
6 files changed, 19 insertions, 10 deletions
diff --git a/roms/Makefile b/roms/Makefile index 1966f04089..6994873314 100644 --- a/roms/Makefile +++ b/roms/Makefile @@ -55,18 +55,27 @@ default: @echo " the EfiRom utility from edk2 / tianocore)" @echo " slof -- update slof.bin" -bios: config.seabios - sh configure-seabios.sh $< - make -C seabios out/bios.bin - cp seabios/out/bios.bin ../pc-bios/bios.bin - cp seabios/out/*dsdt.aml ../pc-bios/ +bios: build-seabios-config-seabios + cp seabios/builds/seabios/bios.bin ../pc-bios/bios.bin + cp seabios/builds/seabios/*dsdt.aml ../pc-bios/ seavgabios: $(patsubst %,seavgabios-%,$(vgabios_variants)) -seavgabios-%: config.vga.% - sh configure-seabios.sh $< - make -C seabios out/vgabios.bin - cp seabios/out/vgabios.bin ../pc-bios/vgabios-$*.bin +seavgabios-isavga: build-seabios-config-vga-isavga + cp seabios/builds/vga-isavga/vgabios.bin ../pc-bios/vgabios.bin + +seavgabios-%: build-seabios-config-vga-% + cp seabios/builds/vga-$*/vgabios.bin ../pc-bios/vgabios-$*.bin + +build-seabios-config-%: config.% + mkdir -p seabios/builds/$* + cp $< seabios/builds/$*/.config + $(MAKE) $(MAKEFLAGS) -C seabios \ + KCONFIG_CONFIG=$(CURDIR)/seabios/builds/$*/.config \ + OUT=$(CURDIR)/seabios/builds/$*/ oldnoconfig + $(MAKE) $(MAKEFLAGS) -C seabios \ + KCONFIG_CONFIG=$(CURDIR)/seabios/builds/$*/.config \ + OUT=$(CURDIR)/seabios/builds/$*/ all lgplvgabios: $(patsubst %,lgplvgabios-%,$(vgabios_variants)) @@ -115,7 +124,7 @@ slof: clean: - rm -rf seabios/.config seabios/out + rm -rf seabios/.config seabios/out seabios/builds $(MAKE) $(MAKEFLAGS) -C vgabios clean rm -f vgabios/VGABIOS-lgpl-latest* $(MAKE) $(MAKEFLAGS) -C ipxe/src veryclean diff --git a/roms/config.vga.cirrus b/roms/config.vga-cirrus index c8fe58239f..c8fe58239f 100644 --- a/roms/config.vga.cirrus +++ b/roms/config.vga-cirrus diff --git a/roms/config.vga.isavga b/roms/config.vga-isavga index e55e294a0c..e55e294a0c 100644 --- a/roms/config.vga.isavga +++ b/roms/config.vga-isavga diff --git a/roms/config.vga.qxl b/roms/config.vga-qxl index d393f0c34f..d393f0c34f 100644 --- a/roms/config.vga.qxl +++ b/roms/config.vga-qxl diff --git a/roms/config.vga.stdvga b/roms/config.vga-stdvga index 7d063b787c..7d063b787c 100644 --- a/roms/config.vga.stdvga +++ b/roms/config.vga-stdvga diff --git a/roms/config.vga.vmware b/roms/config.vga-vmware index eb10427afd..eb10427afd 100644 --- a/roms/config.vga.vmware +++ b/roms/config.vga-vmware |