update configs

6 files changed, 23 insertions, 41 deletions

diff --git a/config.i440fx.efi32 b/config.i440fx.efi32
deleted file mode 100644
index 8808e9e..0000000
--- a/config.i440fx.efi32
+++ /dev/null
@@ -1,13 +0,0 @@
-CONFIG_EXPERT=y
-CONFIG_ANY_TOOLCHAIN=y
-CONFIG_VENDOR_EMULATION=y
-CONFIG_BOARD_EMULATION_QEMU_X86_I440FX=y
-CONFIG_COREBOOT_ROMSIZE_KB_2048=y
-CONFIG_PAYLOAD_TIANOCORE=y
-CONFIG_PAYLOAD_FILE="/usr/share/edk2.git/coreboot-ia32/COREBOOT-with-csm.fd"
-CONFIG_PCI_ROM_RUN=n
-CONFIG_VGA_ROM_RUN=n
-CONFIG_ON_DEVICE_ROM_RUN=n
-CONFIG_CONSOLE_QEMU_DEBUGCON=y
-CONFIG_CONSOLE_CBMEM=y
-# CONFIG_CONSOLE_SERIAL is not set
diff --git a/config.i440fx.seabios b/config.i440fx.seabios
index 76bae6d..33f0c7e 100644
--- a/config.i440fx.seabios
+++ b/config.i440fx.seabios
@@ -13,8 +13,3 @@ CONFIG_CONSOLE_SERIAL=n
 
 CONFIG_PAYLOAD_ELF=y
 CONFIG_PAYLOAD_FILE="/usr/share/seabios.git-coreboot/bios-coreboot.elf"
-
-CONFIG_VGA_BIOS=y
-CONFIG_VGA_BIOS_FILE="/usr/share/seabios.git-coreboot/vgabios-coreboot.bin"
-CONFIG_VGA_BIOS_ID="1234,1111"
-CONFIG_FRAMEBUFFER_KEEP_VESA_MODE=y
diff --git a/config.i440fx.seabios.corevga b/config.i440fx.seabios.corevga
new file mode 100644
index 0000000..76bae6d
--- /dev/null
+++ b/config.i440fx.seabios.corevga
@@ -0,0 +1,20 @@
+CONFIG_EXPERT=y
+CONFIG_ANY_TOOLCHAIN=y
+CONFIG_VENDOR_EMULATION=y
+CONFIG_BOARD_EMULATION_QEMU_X86_I440FX=y
+CONFIG_COREBOOT_ROMSIZE_KB_4096=y
+CONFIG_PCI_ROM_RUN=n
+CONFIG_VGA_ROM_RUN=n
+CONFIG_ON_DEVICE_ROM_RUN=n
+
+CONFIG_CONSOLE_QEMU_DEBUGCON=y
+CONFIG_CONSOLE_CBMEM=y
+CONFIG_CONSOLE_SERIAL=n
+
+CONFIG_PAYLOAD_ELF=y
+CONFIG_PAYLOAD_FILE="/usr/share/seabios.git-coreboot/bios-coreboot.elf"
+
+CONFIG_VGA_BIOS=y
+CONFIG_VGA_BIOS_FILE="/usr/share/seabios.git-coreboot/vgabios-coreboot.bin"
+CONFIG_VGA_BIOS_ID="1234,1111"
+CONFIG_FRAMEBUFFER_KEEP_VESA_MODE=y
diff --git a/config.q35.efi32 b/config.q35.efi32
deleted file mode 100644
index 50460ce..0000000
--- a/config.q35.efi32
+++ /dev/null
@@ -1,13 +0,0 @@
-CONFIG_EXPERT=y
-CONFIG_ANY_TOOLCHAIN=y
-CONFIG_VENDOR_EMULATION=y
-CONFIG_BOARD_EMULATION_QEMU_X86_Q35=y
-CONFIG_COREBOOT_ROMSIZE_KB_2048=y
-CONFIG_PAYLOAD_TIANOCORE=y
-CONFIG_PAYLOAD_FILE="/usr/share/edk2.git/coreboot-ia32/COREBOOT-with-csm.fd"
-CONFIG_PCI_ROM_RUN=n
-CONFIG_VGA_ROM_RUN=n
-CONFIG_ON_DEVICE_ROM_RUN=n
-CONFIG_CONSOLE_QEMU_DEBUGCON=y
-CONFIG_CONSOLE_CBMEM=y
-# CONFIG_CONSOLE_SERIAL is not set
diff --git a/config.q35.seabios b/config.q35.seabios
index 0390af4..df3d9fd 100644
--- a/config.q35.seabios
+++ b/config.q35.seabios
@@ -13,8 +13,3 @@ CONFIG_CONSOLE_SERIAL=n
 
 CONFIG_PAYLOAD_ELF=y
 CONFIG_PAYLOAD_FILE="/usr/share/seabios.git-coreboot/bios-coreboot.elf"
-
-CONFIG_VGA_BIOS=y
-CONFIG_VGA_BIOS_FILE="/usr/share/seabios.git-coreboot/vgabios-coreboot.bin"
-CONFIG_VGA_BIOS_ID="1234,1111"
-CONFIG_FRAMEBUFFER_KEEP_VESA_MODE=y
diff --git a/coreboot.git.spec b/coreboot.git.spec
index 6cd8b36..1e4f2a2 100644
--- a/coreboot.git.spec
+++ b/coreboot.git.spec
@@ -8,10 +8,10 @@ Summary:	open source x86 firmware
 Group:		Applications/Emulators
 License:	GPLv2+
 Source0:	coreboot.git-g0cc33da.tar.xz
+
 Source10:       config.i440fx.seabios
-Source11:       config.i440fx.efi32
+Source11:       config.i440fx.seabios.corevga
 Source20:       config.q35.seabios
-Source21:       config.q35.efi32
 
 BuildRequires:	iasl
 BuildRequires:	python
@@ -54,10 +54,8 @@ mkdir rpm.doc
 mkdir rpm.bin
 
 do_build %{SOURCE10} coreboot-i440fx-seabios
-#do_build %{SOURCE11} coreboot-i440fx-efi32
-
+do_build %{SOURCE11} coreboot-i440fx-seabios-corevga
 do_build %{SOURCE20} coreboot-q35-seabios
-#do_build %{SOURCE21} coreboot-q35-efi32
 
 (cd util/msrtool; ./configure)
 for util in cbmem inteltool lbtdump msrtool nvramtool; do