vgabios: remove submodule and build rules.

It's the old, lgpl vgabios implementation.

Was left in as fallback when we switched to seavgabios, so we could
easily switch back in case we see regressions.  It's unused since years
now, reportedly doesn't even build, and lacks support for recently (and
not so recently) added display devices.

Zap it.

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

diff --git a/.gitmodules b/.gitmodules
index 49e9c2e3f4abc0321c6be09053445f5cb372cee9..d108478e0aabf4bd6d67ec72fce5cce3e0272135 100644 (file)
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,3 @@
-[submodule "roms/vgabios"]
-       path = roms/vgabios
-       url = git://git.qemu-project.org/vgabios.git/
 [submodule "roms/seabios"]
        path = roms/seabios
        url = git://git.qemu-project.org/seabios.git/

diff --git a/roms/Makefile b/roms/Makefile
index a73778f60bff8f4398e86cfbb92986c31f2df0eb..f1ac85ae9b6b3adbc4a60bd962ecf5b20754625e 100644 (file)
--- a/roms/Makefile
+++ b/roms/Makefile
@@ -56,8 +56,7 @@ default:
        @echo "nothing is build by default"
        @echo "available build targets:"
        @echo "  bios           -- update bios.bin (seabios)"
-       @echo "  seavgabios     -- update vgabios binaries (seabios)"
-       @echo "  lgplvgabios    -- update vgabios binaries (lgpl)"
+       @echo "  vgabios        -- update vgabios binaries (seabios)"
        @echo "  sgabios        -- update sgabios binaries"
        @echo "  pxerom         -- update nic roms (bios only)"
        @echo "  efirom         -- update nic roms (bios+efi, this needs"
@@ -71,7 +70,7 @@ bios: build-seabios-config-seabios-128k build-seabios-config-seabios-256k
        cp seabios/builds/seabios-128k/bios.bin ../pc-bios/bios.bin
        cp seabios/builds/seabios-256k/bios.bin ../pc-bios/bios-256k.bin
 
-seavgabios: $(patsubst %,seavgabios-%,$(vgabios_variants))
+vgabios seavgabios: $(patsubst %,seavgabios-%,$(vgabios_variants))
 
 seavgabios-isavga: build-seabios-config-vga-isavga
        cp seabios/builds/vga-isavga/vgabios.bin ../pc-bios/vgabios.bin
@@ -94,17 +93,6 @@ build-seabios-config-%: config.%
                OUT=$(CURDIR)/seabios/builds/$*/ all
 
 
-lgplvgabios: $(patsubst %,lgplvgabios-%,$(vgabios_variants))
-
-lgplvgabios-isavga: build-lgplvgabios
-       cp vgabios/VGABIOS-lgpl-latest.bin ../pc-bios/vgabios.bin
-lgplvgabios-%: build-lgplvgabios
-       cp vgabios/VGABIOS-lgpl-latest.$*.bin ../pc-bios/vgabios-$*.bin
-
-build-lgplvgabios:
-       $(MAKE) -C vgabios $(vgabios_targets)
-
-
 .PHONY: sgabios skiboot
 sgabios:
        $(MAKE) -C sgabios
@@ -159,8 +147,6 @@ skiboot:
 
 clean:
        rm -rf seabios/.config seabios/out seabios/builds
-       $(MAKE) -C vgabios clean
-       rm -f vgabios/VGABIOS-lgpl-latest*
        $(MAKE) -C sgabios clean
        rm -f sgabios/.depend
        $(MAKE) -C ipxe/src veryclean

diff --git a/roms/vgabios b/roms/vgabios
deleted file mode 160000 (submodule)
index 19ea12c..0000000
--- a/roms/vgabios
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 19ea12c230ded95928ecaef0db47a82231c2e485