Merge remote-tracking branch 'remotes/kraxel/tags/pull-roms-2' into s…

…taging 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>
qemu · May 15, 2014 · 16a9189 · 16a9189
2 parents ba43bc2 + d880b28
commit 16a9189
Show file tree

Hide file tree

Showing 18 changed files with 7 additions and 4 deletions.
diff --git a/pc-bios/acpi-dsdt.aml b/pc-bios/acpi-dsdt.aml
diff --git a/pc-bios/bios-256k.bin b/pc-bios/bios-256k.bin
diff --git a/pc-bios/bios.bin b/pc-bios/bios.bin
diff --git a/pc-bios/efi-e1000.rom b/pc-bios/efi-e1000.rom
diff --git a/pc-bios/efi-eepro100.rom b/pc-bios/efi-eepro100.rom
diff --git a/pc-bios/efi-ne2k_pci.rom b/pc-bios/efi-ne2k_pci.rom
diff --git a/pc-bios/efi-pcnet.rom b/pc-bios/efi-pcnet.rom
diff --git a/pc-bios/efi-rtl8139.rom b/pc-bios/efi-rtl8139.rom
diff --git a/pc-bios/efi-virtio.rom b/pc-bios/efi-virtio.rom
diff --git a/pc-bios/vgabios-cirrus.bin b/pc-bios/vgabios-cirrus.bin
diff --git a/pc-bios/vgabios-qxl.bin b/pc-bios/vgabios-qxl.bin
diff --git a/pc-bios/vgabios-stdvga.bin b/pc-bios/vgabios-stdvga.bin
diff --git a/pc-bios/vgabios-vmware.bin b/pc-bios/vgabios-vmware.bin
diff --git a/pc-bios/vgabios.bin b/pc-bios/vgabios.bin
diff --git 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
@@ -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
diff --git a/roms/seabios b/roms/seabios