From: Anthony Liguori Date: Sat, 7 Dec 2013 15:35:16 +0000 (-0800) Subject: Merge remote-tracking branch 'kraxel/tags/pull-seabios-31b8b4e-1' into staging X-Git-Tag: qemu-xen-4.5.0-rc1~305 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=3c88da3c243ff7b452026e207cbba853123250cc;p=qemu-upstream-4.6-testing.git Merge remote-tracking branch 'kraxel/tags/pull-seabios-31b8b4e-1' into staging Update seabios to master snapshot (pre-1.7.4). Update vgabios, switch from lgplvgabios to seavgabios. Update build process to build both 128k and 256k bios versions. Use 256k bios for pc-*-2.0+ machine types. # gpg: Signature made Fri 06 Dec 2013 12:01:24 AM PST using RSA key ID D3E87138 # gpg: Can't check signature: public key not found # By Gerd Hoffmann # Via Gerd Hoffmann * kraxel/tags/pull-seabios-31b8b4e-1: pc: switch 2.0 machine types to large seabios binary roms: update vgabios binaries roms: update seabios binaries roms: enable seabios cross builds roms: build two seabios binaries roms: update seabios submodule to 31b8b4eea9d9ad58a73b22a6060d3ac1c419c26d add firmware to machine options add pc-{i440fx,q35}-2.0 machine types Message-id: 1386322527-23148-1-git-send-email-kraxel@redhat.com Signed-off-by: Anthony Liguori --- 3c88da3c243ff7b452026e207cbba853123250cc