roms: enable parallel seabios / seavgabios builds

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>

diff --git a/roms/Makefile b/roms/Makefile
index 1966f040899198c1fac1d5cfb60b4af6fd57e1d6..6994873314fa9f2d756a24482fc9f4cbbcc3f31d 100644 (file)
--- 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 (file)
index 0000000..c8fe582
--- /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 (file)
index 0000000..e55e294
--- /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 (file)
index 0000000..d393f0c
--- /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 (file)
index 0000000..7d063b7
--- /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 (file)
index 0000000..eb10427
--- /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 (file)
index c8fe582..0000000
--- 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 (file)
index e55e294..0000000
--- 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 (file)
index d393f0c..0000000
--- 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 (file)
index 7d063b7..0000000
--- 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 (file)
index eb10427..0000000
--- 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