summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcelo Tosatti <mtosatti@redhat.com>2009-11-06 10:32:59 -0200
committerMarcelo Tosatti <mtosatti@redhat.com>2009-11-06 10:32:59 -0200
commit07e4a764fbd14432cd42d20f3c46299f78fe3ad7 (patch)
tree76f5eb3ac4b1d3209e16503f3faf86ba3123c89b /pc-bios
parentMerge commit '04095e5ff305fc25a214b52e005153af9d009d66' into upstream-merge (diff)
parentUnbreak Linux build (diff)
downloadqemu-kvm-07e4a764fbd14432cd42d20f3c46299f78fe3ad7.tar.gz
qemu-kvm-07e4a764fbd14432cd42d20f3c46299f78fe3ad7.tar.bz2
qemu-kvm-07e4a764fbd14432cd42d20f3c46299f78fe3ad7.zip
Merge commit 'ed7193ec1dfe201549388789f5bbfe8598fcaf31' into upstream-merge
* commit 'ed7193ec1dfe201549388789f5bbfe8598fcaf31': Unbreak Linux build Update gpxe roms to have BANNER_TIMEOUT=0 Unbreak tap compilation on OS X Revert "Fall back to network boot as the last possible boot option" Fall back to network boot as the last possible boot option Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'pc-bios')
-rw-r--r--pc-bios/README2
-rw-r--r--pc-bios/pxe-e1000.binbin72192 -> 72192 bytes
-rw-r--r--pc-bios/pxe-eepro100.binbin56832 -> 56832 bytes
-rw-r--r--pc-bios/pxe-ne2k_pci.binbin56320 -> 56320 bytes
-rw-r--r--pc-bios/pxe-pcnet.binbin57344 -> 56832 bytes
-rw-r--r--pc-bios/pxe-rtl8139.binbin56320 -> 56320 bytes
-rw-r--r--pc-bios/pxe-virtio.binbin56320 -> 56320 bytes
7 files changed, 1 insertions, 1 deletions
diff --git a/pc-bios/README b/pc-bios/README
index 4ba421ef0..9eaa52262 100644
--- a/pc-bios/README
+++ b/pc-bios/README
@@ -16,7 +16,7 @@
The included images for Sparc32, Sparc64 and PowerPC (for 32 and 64 bit
PPC CPUs) are built from OpenBIOS SVN revision 569.
-- The PXE roms come from Rom-o-Matic gPXE 0.9.9
+- The PXE roms come from Rom-o-Matic gPXE 0.9.9 with BANNER_TIMEOUT=0
e1000 8086:100E
pcnet32 1022:2000
diff --git a/pc-bios/pxe-e1000.bin b/pc-bios/pxe-e1000.bin
index ad7b2fd26..7ac744eb3 100644
--- a/pc-bios/pxe-e1000.bin
+++ b/pc-bios/pxe-e1000.bin
Binary files differ
diff --git a/pc-bios/pxe-eepro100.bin b/pc-bios/pxe-eepro100.bin
index 3bd1b9e14..2ca59ec36 100644
--- a/pc-bios/pxe-eepro100.bin
+++ b/pc-bios/pxe-eepro100.bin
Binary files differ
diff --git a/pc-bios/pxe-ne2k_pci.bin b/pc-bios/pxe-ne2k_pci.bin
index 1c01d46fb..5cb68ab2d 100644
--- a/pc-bios/pxe-ne2k_pci.bin
+++ b/pc-bios/pxe-ne2k_pci.bin
Binary files differ
diff --git a/pc-bios/pxe-pcnet.bin b/pc-bios/pxe-pcnet.bin
index 03484b225..7a54baba1 100644
--- a/pc-bios/pxe-pcnet.bin
+++ b/pc-bios/pxe-pcnet.bin
Binary files differ
diff --git a/pc-bios/pxe-rtl8139.bin b/pc-bios/pxe-rtl8139.bin
index 8110db276..db7d76d9c 100644
--- a/pc-bios/pxe-rtl8139.bin
+++ b/pc-bios/pxe-rtl8139.bin
Binary files differ
diff --git a/pc-bios/pxe-virtio.bin b/pc-bios/pxe-virtio.bin
index 182fa4a1b..6dde514c7 100644
--- a/pc-bios/pxe-virtio.bin
+++ b/pc-bios/pxe-virtio.bin
Binary files differ