From 95f7c6803c71ca6f74e8d59da3fd189230d1c466 Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Tue, 24 Sep 2013 15:38:28 +0200 Subject: roms: enable parallel seabios / seavgabios builds Signed-off-by: Gerd Hoffmann --- roms/Makefile | 29 +++++++++++++++++++---------- roms/config.vga-cirrus | 3 +++ roms/config.vga-isavga | 3 +++ roms/config.vga-qxl | 6 ++++++ roms/config.vga-stdvga | 3 +++ roms/config.vga-vmware | 6 ++++++ roms/config.vga.cirrus | 3 --- roms/config.vga.isavga | 3 --- roms/config.vga.qxl | 6 ------ roms/config.vga.stdvga | 3 --- roms/config.vga.vmware | 6 ------ 11 files changed, 40 insertions(+), 31 deletions(-) create mode 100644 roms/config.vga-cirrus create mode 100644 roms/config.vga-isavga create mode 100644 roms/config.vga-qxl create mode 100644 roms/config.vga-stdvga create mode 100644 roms/config.vga-vmware delete mode 100644 roms/config.vga.cirrus delete mode 100644 roms/config.vga.isavga delete mode 100644 roms/config.vga.qxl delete mode 100644 roms/config.vga.stdvga delete mode 100644 roms/config.vga.vmware (limited to 'roms') 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 new file mode 100644 index 0000000000..c8fe58239f --- /dev/null +++ b/roms/config.vga-cirrus @@ -0,0 +1,3 @@ +CONFIG_BUILD_VGABIOS=y +CONFIG_VGA_CIRRUS=y +CONFIG_VGA_PCI=y diff --git a/roms/config.vga-isavga b/roms/config.vga-isavga new file mode 100644 index 0000000000..e55e294a0c --- /dev/null +++ b/roms/config.vga-isavga @@ -0,0 +1,3 @@ +CONFIG_BUILD_VGABIOS=y +CONFIG_VGA_BOCHS=y +CONFIG_VGA_PCI=n diff --git a/roms/config.vga-qxl b/roms/config.vga-qxl new file mode 100644 index 0000000000..d393f0c34f --- /dev/null +++ b/roms/config.vga-qxl @@ -0,0 +1,6 @@ +CONFIG_BUILD_VGABIOS=y +CONFIG_VGA_BOCHS=y +CONFIG_VGA_PCI=y +CONFIG_OVERRIDE_PCI_ID=y +CONFIG_VGA_VID=0x1b36 +CONFIG_VGA_DID=0x0100 diff --git a/roms/config.vga-stdvga b/roms/config.vga-stdvga new file mode 100644 index 0000000000..7d063b787c --- /dev/null +++ b/roms/config.vga-stdvga @@ -0,0 +1,3 @@ +CONFIG_BUILD_VGABIOS=y +CONFIG_VGA_BOCHS=y +CONFIG_VGA_PCI=y diff --git a/roms/config.vga-vmware b/roms/config.vga-vmware new file mode 100644 index 0000000000..eb10427afd --- /dev/null +++ b/roms/config.vga-vmware @@ -0,0 +1,6 @@ +CONFIG_BUILD_VGABIOS=y +CONFIG_VGA_BOCHS=y +CONFIG_VGA_PCI=y +CONFIG_OVERRIDE_PCI_ID=y +CONFIG_VGA_VID=0x15ad +CONFIG_VGA_DID=0x0405 diff --git a/roms/config.vga.cirrus b/roms/config.vga.cirrus deleted file mode 100644 index c8fe58239f..0000000000 --- a/roms/config.vga.cirrus +++ /dev/null @@ -1,3 +0,0 @@ -CONFIG_BUILD_VGABIOS=y -CONFIG_VGA_CIRRUS=y -CONFIG_VGA_PCI=y diff --git a/roms/config.vga.isavga b/roms/config.vga.isavga deleted file mode 100644 index e55e294a0c..0000000000 --- a/roms/config.vga.isavga +++ /dev/null @@ -1,3 +0,0 @@ -CONFIG_BUILD_VGABIOS=y -CONFIG_VGA_BOCHS=y -CONFIG_VGA_PCI=n diff --git a/roms/config.vga.qxl b/roms/config.vga.qxl deleted file mode 100644 index d393f0c34f..0000000000 --- a/roms/config.vga.qxl +++ /dev/null @@ -1,6 +0,0 @@ -CONFIG_BUILD_VGABIOS=y -CONFIG_VGA_BOCHS=y -CONFIG_VGA_PCI=y -CONFIG_OVERRIDE_PCI_ID=y -CONFIG_VGA_VID=0x1b36 -CONFIG_VGA_DID=0x0100 diff --git a/roms/config.vga.stdvga b/roms/config.vga.stdvga deleted file mode 100644 index 7d063b787c..0000000000 --- a/roms/config.vga.stdvga +++ /dev/null @@ -1,3 +0,0 @@ -CONFIG_BUILD_VGABIOS=y -CONFIG_VGA_BOCHS=y -CONFIG_VGA_PCI=y diff --git a/roms/config.vga.vmware b/roms/config.vga.vmware deleted file mode 100644 index eb10427afd..0000000000 --- a/roms/config.vga.vmware +++ /dev/null @@ -1,6 +0,0 @@ -CONFIG_BUILD_VGABIOS=y -CONFIG_VGA_BOCHS=y -CONFIG_VGA_PCI=y -CONFIG_OVERRIDE_PCI_ID=y -CONFIG_VGA_VID=0x15ad -CONFIG_VGA_DID=0x0405 -- cgit v1.2.1