Consolidate SeaBIOS configs

The only difference between the previous "bios" and "vgabios"
targets was whether or not a VGA BIOS binary was built along with
SeaBIOS.

It seemed needless to compile twice in the event that you
want both the SeaBIOS payload and its VGA BIOS when you can compile
once and make the decision yourself whether to use the produced
vgabios.bin

6 files changed, 2 insertions, 103 deletions

diff --git a/projects/seabios/configs/bios/config b/projects/seabios/configs/bios/config
deleted file mode 100644
index 398dc4f1..00000000
--- a/projects/seabios/configs/bios/config
+++ /dev/null
@@ -1,93 +0,0 @@
-#
-# Automatically generated file; DO NOT EDIT.
-# SeaBIOS Configuration
-#
-
-#
-# General Features
-#
-CONFIG_COREBOOT=y
-# CONFIG_QEMU is not set
-# CONFIG_CSM is not set
-# CONFIG_QEMU_HARDWARE is not set
-CONFIG_THREADS=y
-CONFIG_RELOCATE_INIT=y
-CONFIG_BOOTMENU=y
-CONFIG_BOOTSPLASH=y
-CONFIG_BOOTORDER=y
-CONFIG_COREBOOT_FLASH=y
-CONFIG_LZMA=y
-CONFIG_CBFS_LOCATION=0
-CONFIG_MULTIBOOT=y
-CONFIG_ENTRY_EXTRASTACK=y
-CONFIG_MALLOC_UPPERMEMORY=y
-CONFIG_ROM_SIZE=0
-
-#
-# Hardware support
-#
-CONFIG_ATA=y
-# CONFIG_ATA_DMA is not set
-# CONFIG_ATA_PIO32 is not set
-CONFIG_AHCI=y
-CONFIG_SDCARD=y
-CONFIG_MEGASAS=y
-CONFIG_FLOPPY=y
-CONFIG_FLASH_FLOPPY=y
-CONFIG_NVME=y
-CONFIG_PS2PORT=y
-CONFIG_USB=y
-CONFIG_USB_UHCI=y
-CONFIG_USB_OHCI=y
-CONFIG_USB_EHCI=y
-CONFIG_USB_XHCI=y
-CONFIG_USB_MSC=y
-CONFIG_USB_UAS=y
-CONFIG_USB_HUB=y
-CONFIG_USB_KEYBOARD=y
-CONFIG_USB_MOUSE=y
-CONFIG_SERIAL=y
-CONFIG_SERCON=y
-CONFIG_LPT=y
-CONFIG_RTC_TIMER=y
-CONFIG_HARDWARE_IRQ=y
-CONFIG_PMTIMER=y
-CONFIG_TSC_TIMER=y
-
-#
-# BIOS interfaces
-#
-CONFIG_DRIVES=y
-CONFIG_CDROM_BOOT=y
-CONFIG_CDROM_EMU=y
-CONFIG_PCIBIOS=y
-CONFIG_APMBIOS=y
-CONFIG_PNPBIOS=y
-CONFIG_OPTIONROMS=y
-CONFIG_PMM=y
-CONFIG_BOOT=y
-CONFIG_KEYBOARD=y
-CONFIG_KBD_CALL_INT15_4F=y
-CONFIG_MOUSE=y
-CONFIG_S3_RESUME=y
-CONFIG_VGAHOOKS=y
-# CONFIG_DISABLE_A20 is not set
-CONFIG_TCGBIOS=y
-
-#
-# VGA ROM
-#
-CONFIG_NO_VGABIOS=y
-# CONFIG_VGA_GEODEGX2 is not set
-# CONFIG_VGA_GEODELX is not set
-# CONFIG_VGA_COREBOOT is not set
-# CONFIG_BUILD_VGABIOS is not set
-CONFIG_VGA_EXTRA_STACK_SIZE=512
-
-#
-# Debugging
-#
-CONFIG_DEBUG_LEVEL=1
-# CONFIG_DEBUG_SERIAL is not set
-# CONFIG_DEBUG_SERIAL_MMIO is not set
-CONFIG_DEBUG_COREBOOT=y
diff --git a/projects/seabios/configs/vgabios/config b/projects/seabios/configs/config
index 5b2d44b6..5b2d44b6 100644
--- a/projects/seabios/configs/vgabios/config
+++ b/projects/seabios/configs/config
diff --git a/projects/seabios/configs/bios/install b/projects/seabios/configs/install
index 9189ec8f..dd4c65c0 100644
--- a/projects/seabios/configs/bios/install
+++ b/projects/seabios/configs/install
@@ -1 +1,2 @@
 bios.bin.elf:bios.bin.elf
+vgabios.bin:vgabios.bin
diff --git a/projects/seabios/configs/targets b/projects/seabios/configs/targets
deleted file mode 100644
index 98a59a61..00000000
--- a/projects/seabios/configs/targets
+++ /dev/null
@@ -1,2 +0,0 @@
-bios
-vgabios
diff --git a/projects/seabios/configs/vgabios/install b/projects/seabios/configs/vgabios/install
deleted file mode 100644
index ddc1571e..00000000
--- a/projects/seabios/configs/vgabios/install
+++ /dev/null
@@ -1 +0,0 @@
-vgabios.bin:vgabios.bin
diff --git a/projects/seabios/seabios b/projects/seabios/seabios
index ce9593b0..0ff7b313 100755
--- a/projects/seabios/seabios
+++ b/projects/seabios/seabios
@@ -75,13 +75,7 @@ build() {
 	cp "$seabios_config_path" "$sources_path/.config"
 
 	make -C "$sources_path" -j"$TASKS"
-
-	if [[ "$target" == 'bios' ]]; then
-		cp "$sources_path/out/bios.bin.elf" "$build_path"
-	elif [[ "$target" == 'vgabios' ]]; then
-		cp "$sources_path/out/vgabios.bin" "$build_path"
-	fi
-
+	cp "$sources_path/out"/{bios.bin.elf,vgabios.bin} "$build_path"
 	make -C "$sources_path" distclean
 
 	rm -f "$sources_path/.config"