qemu-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-devel] [PULL 4/7] vgabios: remove submodule and build rules.


From: Gerd Hoffmann
Subject: [Qemu-devel] [PULL 4/7] vgabios: remove submodule and build rules.
Date: Mon, 2 Jul 2018 17:42:19 +0200

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 <address@hidden>
---
 .gitmodules   |  3 ---
 roms/Makefile | 18 ++----------------
 roms/vgabios  |  1 -
 3 files changed, 2 insertions(+), 20 deletions(-)
 delete mode 160000 roms/vgabios

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
index 19ea12c230..0000000000
--- a/roms/vgabios
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 19ea12c230ded95928ecaef0db47a82231c2e485
-- 
2.9.3




reply via email to

[Prev in Thread] Current Thread [Next in Thread]