eepro100: Use a single rom file for all i825xx devices
Patching the rom data during load (in qemu) now also supports i82801 (which had no rom file). We only need a single rom file for the whole device family, so remove the second one which is no longer needed. Cc: Markus Armbruster <armbru@redhat.com> Cc: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Stefan Weil <weil@mail.berlios.de> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
parent
ab85ceb1ad
commit
0389ced419
1
Makefile
1
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 \
|
||||
|
@ -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;
|
||||
|
@ -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
|
||||
|
Binary file not shown.
Loading…
Reference in New Issue
Block a user