aboutsummaryrefslogtreecommitdiff
path: root/roms
diff options
context:
space:
mode:
authorGerd Hoffmann <kraxel@redhat.com>2016-07-04 17:22:17 +0200
committerGerd Hoffmann <kraxel@redhat.com>2016-07-04 17:23:33 +0200
commit3b1154fff16cf3bb9297d65145c89321bc1b7aa4 (patch)
tree09da752fb3cdcd3b6e0dcd36868ff795301174f3 /roms
parent3173a1fd549b7fa0f7029b2c6a6b86ba6efa92aa (diff)
downloadqemu-3b1154fff16cf3bb9297d65145c89321bc1b7aa4.zip
qemu-3b1154fff16cf3bb9297d65145c89321bc1b7aa4.tar.gz
qemu-3b1154fff16cf3bb9297d65145c89321bc1b7aa4.tar.bz2
Revert "bios: Add fast variant of SeaBIOS for use with -kernel on x86."
This reverts commit 4e04ab6a63ebe9fb4305e7e8e49cc8b0095db8fb. Also remove pc-bios/bios-fast.bin. Commit was merged by mistake. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Diffstat (limited to 'roms')
-rw-r--r--roms/Makefile4
-rw-r--r--roms/config.seabios-fast27
2 files changed, 1 insertions, 30 deletions
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