| commit | 16a9189921bdb9e351f2f9baec16b376f8d71cdf | [log] [tgz] |
|---|---|---|
| author | Peter Maydell <peter.maydell@linaro.org> | Thu May 15 18:32:16 2014 +0100 |
| committer | Peter Maydell <peter.maydell@linaro.org> | Thu May 15 18:32:16 2014 +0100 |
| tree | 7cd513137b0ce1ed68a7a9e9a851abc58211d5f0 | |
| parent | ba43bc25c9793ae57d7b5539fecc26015a96107f [diff] | |
| parent | d880b28cef4a8b4bc489a5caec201d019b9c0add [diff] |
Merge remote-tracking branch 'remotes/kraxel/tags/pull-roms-2' into staging seabios: update to 1.7.5-rc1 ipxe: update to current git # gpg: Signature made Thu 15 May 2014 13:29:37 BST using RSA key ID D3E87138 # gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>" # gpg: aka "Gerd Hoffmann <gerd@kraxel.org>" # gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>" * remotes/kraxel/tags/pull-roms-2: ipxe: update to current git seabios: update to 1.7.5-rc1 Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
diff --git a/pc-bios/acpi-dsdt.aml b/pc-bios/acpi-dsdt.aml index cfd16d7..558c10f 100644 --- a/pc-bios/acpi-dsdt.aml +++ b/pc-bios/acpi-dsdt.aml Binary files differ
diff --git a/pc-bios/bios-256k.bin b/pc-bios/bios-256k.bin index 93202c5..3e60a3d 100644 --- a/pc-bios/bios-256k.bin +++ b/pc-bios/bios-256k.bin Binary files differ
diff --git a/pc-bios/bios.bin b/pc-bios/bios.bin index d7899bd..d360d0a 100644 --- a/pc-bios/bios.bin +++ b/pc-bios/bios.bin Binary files differ
diff --git a/pc-bios/efi-e1000.rom b/pc-bios/efi-e1000.rom index 21b880a..776e217 100644 --- a/pc-bios/efi-e1000.rom +++ b/pc-bios/efi-e1000.rom Binary files differ
diff --git a/pc-bios/efi-eepro100.rom b/pc-bios/efi-eepro100.rom index 1799c38..677a8c3 100644 --- a/pc-bios/efi-eepro100.rom +++ b/pc-bios/efi-eepro100.rom Binary files differ
diff --git a/pc-bios/efi-ne2k_pci.rom b/pc-bios/efi-ne2k_pci.rom index 5d1b38b..9dd6d91 100644 --- a/pc-bios/efi-ne2k_pci.rom +++ b/pc-bios/efi-ne2k_pci.rom Binary files differ
diff --git a/pc-bios/efi-pcnet.rom b/pc-bios/efi-pcnet.rom index 79fa7a9..cae3a85 100644 --- a/pc-bios/efi-pcnet.rom +++ b/pc-bios/efi-pcnet.rom Binary files differ
diff --git a/pc-bios/efi-rtl8139.rom b/pc-bios/efi-rtl8139.rom index 0b78f1a..477f9b9 100644 --- a/pc-bios/efi-rtl8139.rom +++ b/pc-bios/efi-rtl8139.rom Binary files differ
diff --git a/pc-bios/efi-virtio.rom b/pc-bios/efi-virtio.rom index e6b2bf7..935c927 100644 --- a/pc-bios/efi-virtio.rom +++ b/pc-bios/efi-virtio.rom Binary files differ
diff --git a/pc-bios/vgabios-cirrus.bin b/pc-bios/vgabios-cirrus.bin index d8cb9d2..2ddef2e 100644 --- a/pc-bios/vgabios-cirrus.bin +++ b/pc-bios/vgabios-cirrus.bin Binary files differ
diff --git a/pc-bios/vgabios-qxl.bin b/pc-bios/vgabios-qxl.bin index fe57401..f84a984 100644 --- a/pc-bios/vgabios-qxl.bin +++ b/pc-bios/vgabios-qxl.bin Binary files differ
diff --git a/pc-bios/vgabios-stdvga.bin b/pc-bios/vgabios-stdvga.bin index 2aa659c..833c464 100644 --- a/pc-bios/vgabios-stdvga.bin +++ b/pc-bios/vgabios-stdvga.bin Binary files differ
diff --git a/pc-bios/vgabios-vmware.bin b/pc-bios/vgabios-vmware.bin index bed7068..c4bf322 100644 --- a/pc-bios/vgabios-vmware.bin +++ b/pc-bios/vgabios-vmware.bin Binary files differ
diff --git a/pc-bios/vgabios.bin b/pc-bios/vgabios.bin index 928095f..55c6db3 100644 --- a/pc-bios/vgabios.bin +++ b/pc-bios/vgabios.bin Binary files differ
diff --git a/roms/config.ipxe.general.h b/roms/config.ipxe.general.h index b3fce53..619ee4c 100644 --- a/roms/config.ipxe.general.h +++ b/roms/config.ipxe.general.h
@@ -1,2 +1,4 @@ #undef BANNER_TIMEOUT -#define BANNER_TIMEOUT 0 +#define BANNER_TIMEOUT 30 +#undef ROM_BANNER_TIMEOUT +#define ROM_BANNER_TIMEOUT 0
diff --git a/roms/config.seabios-128k b/roms/config.seabios-128k index 41f8381..e653c75 100644 --- a/roms/config.seabios-128k +++ b/roms/config.seabios-128k
@@ -1,6 +1,7 @@ # for qemu machine types 1.7 + older -# need to turn off features (xhci) to make it fit into 128k +# need to turn off features (xhci,uas) to make it fit into 128k CONFIG_QEMU=y CONFIG_ROM_SIZE=128 CONFIG_XEN=n CONFIG_USB_XHCI=n +CONFIG_USB_UAS=n
diff --git a/roms/ipxe b/roms/ipxe index 09c5109..69313ed 160000 --- a/roms/ipxe +++ b/roms/ipxe
@@ -1 +1 @@ -Subproject commit 09c5109b8585178172c7608de8d52e9d9af0b680 +Subproject commit 69313edad85f8958acc8a47272b3c3da494835ec
diff --git a/roms/seabios b/roms/seabios index 96917a8..b1d4dc9 160000 --- a/roms/seabios +++ b/roms/seabios
@@ -1 +1 @@ -Subproject commit 96917a8ed761f017fc8c72ba3b9181fbac03ac59 +Subproject commit b1d4dc908401719c5de78c25313cf82c7cd1d602