summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile1
-rw-r--r--hw/eepro100.c14
-rw-r--r--pc-bios/README2
-rw-r--r--pc-bios/gpxe-eepro100-80861229.rombin56832 -> 0 bytes
4 files changed, 4 insertions, 13 deletions
diff --git a/Makefile b/Makefile
index 02698e976c..2883d27f25 100644
--- a/Makefile
+++ b/Makefile
@@ -181,7 +181,6 @@ ifdef INSTALL_BLOBS
BLOBS=bios.bin vgabios.bin vgabios-cirrus.bin ppc_rom.bin \
openbios-sparc32 openbios-sparc64 openbios-ppc \
gpxe-eepro100-80861209.rom \
-gpxe-eepro100-80861229.rom \
pxe-e1000.bin \
pxe-ne2k_pci.bin pxe-pcnet.bin \
pxe-rtl8139.bin pxe-virtio.bin \
diff --git a/hw/eepro100.c b/hw/eepro100.c
index 41d792ad24..f8a700a2b8 100644
--- a/hw/eepro100.c
+++ b/hw/eepro100.c
@@ -2048,17 +2048,9 @@ static void eepro100_register_devices(void)
size_t i;
for (i = 0; i < ARRAY_SIZE(e100_devices); i++) {
PCIDeviceInfo *pci_dev = &e100_devices[i].pci;
- switch (e100_devices[i].device_id) {
- case PCI_DEVICE_ID_INTEL_82551IT:
- pci_dev->romfile = "gpxe-eepro100-80861209.rom";
- break;
- case PCI_DEVICE_ID_INTEL_82557:
- pci_dev->romfile = "gpxe-eepro100-80861229.rom";
- break;
- case 0x2449:
- pci_dev->romfile = "gpxe-eepro100-80862449.rom";
- break;
- }
+ /* We use the same rom file for all device ids.
+ QEMU fixes the device id during rom load. */
+ pci_dev->romfile = "gpxe-eepro100-80861209.rom";
pci_dev->init = e100_nic_init;
pci_dev->exit = pci_nic_uninit;
pci_dev->qdev.props = e100_properties;
diff --git a/pc-bios/README b/pc-bios/README
index 3172cf7896..4b019e08a1 100644
--- a/pc-bios/README
+++ b/pc-bios/README
@@ -16,7 +16,7 @@
- The PXE roms come from Rom-o-Matic gPXE 0.9.9 with BANNER_TIMEOUT=0
e1000 8086:100E
- eepro100 8086:1209, 8086:1229
+ eepro100 8086:1209 (also used for 8086:1229 and 8086:2449)
ns8390 1050:0940
pcnet32 1022:2000
rtl8139 10ec:8139
diff --git a/pc-bios/gpxe-eepro100-80861229.rom b/pc-bios/gpxe-eepro100-80861229.rom
deleted file mode 100644
index 9cf397e3de..0000000000
--- a/pc-bios/gpxe-eepro100-80861229.rom
+++ /dev/null
Binary files differ