summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcelo Tosatti <mtosatti@redhat.com>2009-11-06 10:32:14 -0200
committerMarcelo Tosatti <mtosatti@redhat.com>2009-11-06 10:32:14 -0200
commit2fb0744e0dde372223f627dba99934559aa06e14 (patch)
treefc6625811de6e5b77a7dd5e29766f063703f0b18 /pc-bios
parentMerge commit 'fd646122418ecefcde228d43821d07da79dd99bb' into upstream-merge (diff)
parentRemove e1000 rom loading hack (diff)
downloadqemu-kvm-2fb0744e0dde372223f627dba99934559aa06e14.tar.gz
qemu-kvm-2fb0744e0dde372223f627dba99934559aa06e14.tar.bz2
qemu-kvm-2fb0744e0dde372223f627dba99934559aa06e14.zip
Merge commit '04095e5ff305fc25a214b52e005153af9d009d66' into upstream-merge
* commit '04095e5ff305fc25a214b52e005153af9d009d66': Remove e1000 rom loading hack Switch from etherboot to gPXE Conflicts: hw/pc.c Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'pc-bios')
-rw-r--r--pc-bios/README13
-rw-r--r--pc-bios/pxe-e1000.binbin32768 -> 72192 bytes
-rw-r--r--pc-bios/pxe-eepro100.binbin0 -> 56832 bytes
-rw-r--r--pc-bios/pxe-ne2k_pci.binbin32768 -> 56320 bytes
-rw-r--r--pc-bios/pxe-pcnet.binbin32768 -> 57344 bytes
-rw-r--r--pc-bios/pxe-rtl8139.binbin32768 -> 56320 bytes
-rw-r--r--pc-bios/pxe-virtio.binbin0 -> 56320 bytes
7 files changed, 9 insertions, 4 deletions
diff --git a/pc-bios/README b/pc-bios/README
index ddd91f49e..4ba421ef0 100644
--- a/pc-bios/README
+++ b/pc-bios/README
@@ -16,8 +16,13 @@
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 etherboot 5.4.2.
- pcnet32:pcnet32 -- [0x1022,0x2000]
- ns8390:winbond940 -- [0x1050,0x0940]
- rtl8139:rtl8139 -- [0x10ec,0x8139]
+- The PXE roms come from Rom-o-Matic gPXE 0.9.9
+
+ e1000 8086:100E
+ pcnet32 1022:2000
+ ns8390 1050:0940
+ rtl8139 10ec:8139
+ eepro100 8086:1209
+ virtio 1af4:1000
+
http://rom-o-matic.net/
diff --git a/pc-bios/pxe-e1000.bin b/pc-bios/pxe-e1000.bin
index 99e4c1f25..ad7b2fd26 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
new file mode 100644
index 000000000..3bd1b9e14
--- /dev/null
+++ 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 8d8fc02af..1c01d46fb 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 d127d3378..03484b225 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 2b5cacbbb..8110db276 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
new file mode 100644
index 000000000..182fa4a1b
--- /dev/null
+++ b/pc-bios/pxe-virtio.bin
Binary files differ