aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerd Hoffmann <kraxel@redhat.com>2018-06-20 12:11:42 +0200
committerGerd Hoffmann <kraxel@redhat.com>2018-07-02 17:20:54 +0200
commit91b8eba9ec3f5af7dd48927811eb7ff69fc4617f (patch)
tree3b200d3267bb4db2616ce0ac6c70963bbe0d912a
parenteda553a442e94dc16d424849b65c6cb7f140f318 (diff)
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>
-rw-r--r--.gitmodules3
-rw-r--r--roms/Makefile18
m---------roms/vgabios0
3 files changed, 2 insertions, 19 deletions
diff --git a/.gitmodules b/.gitmodules
index 49e9c2e3f4..d108478e0a 100644
--- 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 a73778f60b..f1ac85ae9b 100644
--- 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
-Subproject 19ea12c230ded95928ecaef0db47a82231c2e48