[PULL,1/1] Revert "bios: Add fast variant of SeaBIOS for use with -kernel on x86."

Commit Message

Gerd Hoffmann July 4, 2016, 3:26 p.m. UTC

This reverts commit 4e04ab6a63ebe9fb4305e7e8e49cc8b0095db8fb.

Also remove pc-bios/bios-fast.bin.

Commit was merged by mistake.

Signed-off-by: Gerd Hoffmann <[e-mail]>
---
 Makefile                 |   3 +--
 pc-bios/bios-fast.bin    | Bin 65536 -> 0 bytes
 roms/Makefile            |   4 +---
 roms/config.seabios-fast |  27 ---------------------------
 4 files changed, 2 insertions(+), 32 deletions(-)
 delete mode 100644 pc-bios/bios-fast.bin
 delete mode 100644 roms/config.seabios-fast

Patch

diff --git a/Makefile b/Makefile
index 7bfb8b4..9d12dc6 100644
--- a/Makefile
+++ b/Makefile
@@ -408,8 +408,7 @@  common  de-ch  es     fo  fr-ca  hu     ja  mk  nl-be      pt  sl     tr \
 bepo    cz
 
 ifdef INSTALL_BLOBS
-BLOBS=bios.bin bios-256k.bin bios-fast.bin \
-sgabios.bin vgabios.bin vgabios-cirrus.bin \
+BLOBS=bios.bin bios-256k.bin sgabios.bin vgabios.bin vgabios-cirrus.bin \
 vgabios-stdvga.bin vgabios-vmware.bin vgabios-qxl.bin vgabios-virtio.bin \
 acpi-dsdt.aml \
 ppc_rom.bin openbios-sparc32 openbios-sparc64 openbios-ppc QEMU,tcx.bin QEMU,cgthree.bin \
diff --git a/pc-bios/bios-fast.bin b/pc-bios/bios-fast.bin
deleted file mode 100644
index 00cda3c..0000000
Binary files a/pc-bios/bios-fast.bin and /dev/null differ
diff --git a/roms/Makefile b/roms/Makefile
index 26b0586..7bd1252 100644
--- a/roms/Makefile
+++ b/roms/Makefile
@@ -61,11 +61,9 @@  default:
 	@echo "  slof           -- update slof.bin"
 	@echo "  u-boot.e500    -- update u-boot.e500"
 
-bios: build-seabios-config-seabios-128k build-seabios-config-seabios-256k \
-      build-seabios-config-seabios-fast
+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
-	cp seabios/builds/seabios-fast/bios.bin ../pc-bios/bios-fast.bin
 
 seavgabios: $(patsubst %,seavgabios-%,$(vgabios_variants))
 
diff --git a/roms/config.seabios-fast b/roms/config.seabios-fast
deleted file mode 100644
index 045693e..0000000
--- a/roms/config.seabios-fast
+++ /dev/null
@@ -1,27 +0,0 @@ 
-# The fastest SeaBIOS that can boot Linux using -kernel.
-# NB: Since we are using -kernel, we don't need SeaBIOS itself
-# to do any boot drive detection, boot ordering, etc.
-
-# general stuff
-CONFIG_QEMU=y
-CONFIG_ROM_SIZE=0
-CONFIG_WRITABLE_UPPERMEMORY=y
-CONFIG_RELOCATE_INIT=n
-
-# no input, no boot menu
-CONFIG_MOUSE=n
-CONFIG_KEYBOARD=n
-CONFIG_BOOTMENU=n
-CONFIG_BOOTSPLASH=n
-CONFIG_BOOTORDER=n
-
-# hardware support we don't need
-CONFIG_LPT=n
-CONFIG_SERIAL=n
-CONFIG_USB=n
-CONFIG_DRIVES=n
-CONFIG_TCGBIOS=n
-CONFIG_VGAHOOKS=n
-
-# no logging
-CONFIG_DEBUG_LEVEL=0