Skip to content

Commit

Permalink
vgabios: remove submodule and build rules.
Browse files Browse the repository at this point in the history
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 <[email protected]>
  • Loading branch information
kraxel committed Jul 2, 2018
1 parent eda553a commit 91b8eba
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 20 deletions.
3 changes: 0 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -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/
Expand Down
18 changes: 2 additions & 16 deletions roms/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion roms/vgabios
Submodule vgabios deleted from 19ea12

0 comments on commit 91b8eba

Please sign in to comment.