Build 256k bios imaes for qemu 2.0

config.coreboot

@@ -0,0 +1,2 @@
+CONFIG_QEMU_HARDWARE=y
+CONFIG_COREBOOT=y

config.csm

@@ -0,0 +1,2 @@
+CONFIG_QEMU_HARDWARE=y
+CONFIG_CSM=y

config.seabios-128k

@@ -0,0 +1,6 @@
+# for qemu machine types 1.7 + older
+# need to turn off features (xhci) to make it fit into 128k
+CONFIG_QEMU=y
+CONFIG_ROM_SIZE=128
+CONFIG_XEN=n
+CONFIG_USB_XHCI=n

config.seabios-256k

@@ -0,0 +1,3 @@
+# for qemu machine types 2.0 + newer
+CONFIG_QEMU=y
+CONFIG_ROM_SIZE=256

seabios.spec

@@ -1,6 +1,6 @@
 Name:           seabios
 Version:        1.7.4
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Open-source legacy BIOS implementation
 
 Group:          Applications/Emulators
@@ -14,6 +14,10 @@ Source11:       config.vga.isavga
 Source12:       config.vga.qxl
 Source13:       config.vga.stdvga
 Source14:       config.vga.vmware
+Source15:       config.csm
+Source16:       config.coreboot
+Source17:       config.seabios-128k
+Source18:       config.seabios-256k
 
 # Fix kvm migration with empty virtio-scsi controller (bz #1032208)
 Patch0001: 0001-init_virtio_scsi-reset-the-HBA-before-freeing-its-vi.patch
@@ -81,15 +85,10 @@ sed -i 's,VERSION=%{version}.*,VERSION=%{version},g' Makefile
 export CFLAGS="$RPM_OPT_FLAGS"
 mkdir binaries
 
-# seabios
-echo 'CONFIG_DEBUG_LEVEL=%{debug_level}' > config.template
-echo 'CONFIG_QEMU_HARDWARE=y' >> config.template
-echo 'CONFIG_PERMIT_UNALIGNED_PCIROM=y' >> config.template
-
 build_bios() {
-    make clean
+    make clean distclean
-    cp config.template .config
+    cp $1 .config
-    echo CONFIG_`echo $1 | tr a-z A-Z`=y >> .config
+    echo "CONFIG_DEBUG_LEVEL=%{debug_level}" >> .config
     make oldnoconfig V=1
 
     make V=1 \
@@ -99,39 +98,30 @@ build_bios() {
         LD=x86_64-linux-gnu-ld \
         OBJCOPY=x86_64-linux-gnu-objcopy \
         OBJDUMP=x86_64-linux-gnu-objdump \
-        STRIP=x86_64-linux-gnu-strip
+        STRIP=x86_64-linux-gnu-strip $4
-  cp out/$2 binaries/bios-$1.bin
+
+    cp out/$2 binaries/$3
 }
 
-build_bios csm Csm16.bin
+# seabios
-build_bios coreboot bios.bin.elf
+build_bios %{SOURCE15} Csm16.bin bios-csm.bin
-build_bios qemu bios.bin
+build_bios %{SOURCE16} bios.bin.elf bios-coreboot.bin
+build_bios %{SOURCE17} bios.bin bios.bin
+build_bios %{SOURCE18} bios.bin bios-256k.bin
 cp out/src/fw/*dsdt*.aml binaries
 
 # seavgabios
 for config in %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} %{SOURCE14}; do
-	name=${config#*config.vga.}
+    name=${config#*config.vga.}
-	make clean distclean
+    build_bios ${config} vgabios.bin vgabios-${name}.bin out/vgabios.bin
-	cp ${config} .config
-	echo "CONFIG_DEBUG_LEVEL=%{debug_level}" >> .config
-	make oldnoconfig
-	make V=1 \
-		HOSTCC=gcc \
-		CC=x86_64-linux-gnu-gcc \
-		AS=x86_64-linux-gnu-as \
-		LD=x86_64-linux-gnu-ld \
-		OBJCOPY=x86_64-linux-gnu-objcopy \
-		OBJDUMP=x86_64-linux-gnu-objdump \
-		STRIP=x86_64-linux-gnu-strip \
-		out/vgabios.bin
-	cp out/vgabios.bin binaries/vgabios-${name}.bin
 done
 
 
 %install
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/seabios
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/seavgabios
-install -m 0644 binaries/bios-qemu.bin $RPM_BUILD_ROOT%{_datadir}/seabios/bios.bin
+install -m 0644 binaries/bios.bin $RPM_BUILD_ROOT%{_datadir}/seabios/bios.bin
+install -m 0644 binaries/bios-256k.bin $RPM_BUILD_ROOT%{_datadir}/seabios/bios-256k.bin
 install -m 0644 binaries/bios-csm.bin $RPM_BUILD_ROOT%{_datadir}/seabios/bios-csm.bin
 install -m 0644 binaries/bios-coreboot.bin $RPM_BUILD_ROOT%{_datadir}/seabios/bios-coreboot.bin
 install -m 0644 binaries/*.aml $RPM_BUILD_ROOT%{_datadir}/seabios
@@ -153,6 +143,9 @@ install -m 0644 binaries/vgabios*.bin $RPM_BUILD_ROOT%{_datadir}/seavgabios
 
 
 %changelog
+* Mon Mar 17 2014 Cole Robinson <crobinso@redhat.com> 1.7.4-3
+- Build 256k bios images for qemu 2.0
+
 * Thu Mar 13 2014 Cole Robinson <crobinso@redhat.com> - 1.7.4-2
 - Fix kvm migration with empty virtio-scsi controller (bz #1032208)