From 95f7c6803c71ca6f74e8d59da3fd189230d1c466 Mon Sep 17 00:00:00 2001
From: Gerd Hoffmann <kraxel@redhat.com>
Date: Tue, 24 Sep 2013 15:38:28 +0200
Subject: [PATCH] roms: enable parallel seabios / seavgabios builds

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 roms/Makefile                                 | 29 ++++++++++++-------
 roms/{config.vga.cirrus => config.vga-cirrus} |  0
 roms/{config.vga.isavga => config.vga-isavga} |  0
 roms/{config.vga.qxl => config.vga-qxl}       |  0
 roms/{config.vga.stdvga => config.vga-stdvga} |  0
 roms/{config.vga.vmware => config.vga-vmware} |  0
 6 files changed, 19 insertions(+), 10 deletions(-)
 rename roms/{config.vga.cirrus => config.vga-cirrus} (100%)
 rename roms/{config.vga.isavga => config.vga-isavga} (100%)
 rename roms/{config.vga.qxl => config.vga-qxl} (100%)
 rename roms/{config.vga.stdvga => config.vga-stdvga} (100%)
 rename roms/{config.vga.vmware => config.vga-vmware} (100%)

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
similarity index 100%
rename from roms/config.vga.cirrus
rename to roms/config.vga-cirrus
diff --git a/roms/config.vga.isavga b/roms/config.vga-isavga
similarity index 100%
rename from roms/config.vga.isavga
rename to roms/config.vga-isavga
diff --git a/roms/config.vga.qxl b/roms/config.vga-qxl
similarity index 100%
rename from roms/config.vga.qxl
rename to roms/config.vga-qxl
diff --git a/roms/config.vga.stdvga b/roms/config.vga-stdvga
similarity index 100%
rename from roms/config.vga.stdvga
rename to roms/config.vga-stdvga
diff --git a/roms/config.vga.vmware b/roms/config.vga-vmware
similarity index 100%
rename from roms/config.vga.vmware
rename to roms/config.vga-vmware