Commit 3c88da3c authored by Anthony Liguori's avatar Anthony Liguori
Browse files

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: default avatarAnthony Liguori <aliguori@amazon.com>
parents 2a576ee6 bcf2b7d2

hw/i386/pc_piix.c

+14 −2
Original line number Diff line number Diff line
@@ -339,13 +339,24 @@ static void pc_xen_hvm_init(QEMUMachineInitArgs *args) 
    .desc = "Standard PC (i440FX + PIIX, 1996)", \

    .hot_add_cpu = pc_hot_add_cpu



#define PC_I440FX_2_0_MACHINE_OPTIONS                           \

    PC_I440FX_MACHINE_OPTIONS,                                  \

    .default_machine_opts = "firmware=bios-256k.bin"



static QEMUMachine pc_i440fx_machine_v2_0 = {

    PC_I440FX_2_0_MACHINE_OPTIONS,

    .name = "pc-i440fx-2.0",

    .alias = "pc",

    .init = pc_init_pci,

    .is_default = 1,

};



#define PC_I440FX_1_7_MACHINE_OPTIONS PC_I440FX_MACHINE_OPTIONS



static QEMUMachine pc_i440fx_machine_v1_7 = {

    PC_I440FX_1_7_MACHINE_OPTIONS,

    .name = "pc-i440fx-1.7",

    .alias = "pc",

    .init = pc_init_pci,

    .is_default = 1,

};



#define PC_I440FX_1_6_MACHINE_OPTIONS PC_I440FX_MACHINE_OPTIONS
@@ -747,6 +758,7 @@ static QEMUMachine xenfv_machine = { 


static void pc_machine_init(void)

{

    qemu_register_machine(&pc_i440fx_machine_v2_0);

    qemu_register_machine(&pc_i440fx_machine_v1_7);

    qemu_register_machine(&pc_i440fx_machine_v1_6);

    qemu_register_machine(&pc_i440fx_machine_v1_5);

hw/i386/pc_q35.c

+12 −1
Original line number Diff line number Diff line
@@ -259,12 +259,22 @@ static void pc_q35_init_1_4(QEMUMachineInitArgs *args) 
    .desc = "Standard PC (Q35 + ICH9, 2009)", \

    .hot_add_cpu = pc_hot_add_cpu



#define PC_Q35_2_0_MACHINE_OPTIONS                      \

    PC_Q35_MACHINE_OPTIONS,                             \

    .default_machine_opts = "firmware=bios-256k.bin"



static QEMUMachine pc_q35_machine_v2_0 = {

    PC_Q35_2_0_MACHINE_OPTIONS,

    .name = "pc-q35-2.0",

    .alias = "q35",

    .init = pc_q35_init,

};



#define PC_Q35_1_7_MACHINE_OPTIONS PC_Q35_MACHINE_OPTIONS



static QEMUMachine pc_q35_machine_v1_7 = {

    PC_Q35_1_7_MACHINE_OPTIONS,

    .name = "pc-q35-1.7",

    .alias = "q35",

    .init = pc_q35_init,

};
@@ -306,6 +316,7 @@ static QEMUMachine pc_q35_machine_v1_4 = { 


static void pc_q35_machine_init(void)

{

    qemu_register_machine(&pc_q35_machine_v2_0);

    qemu_register_machine(&pc_q35_machine_v1_7);

    qemu_register_machine(&pc_q35_machine_v1_6);

    qemu_register_machine(&pc_q35_machine_v1_5);

pc-bios/acpi-dsdt.aml

(4.3 KiB)

File changed.

No diff preview for this file type.

View original file
View changed file

pc-bios/bios-256k.bin

0 → 100644
+256 KiB

File added.

No diff preview for this file type.

View file

pc-bios/bios.bin

(128 KiB)

File changed.

No diff preview for this file type.

View original file
View changed file