diff options
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | hw/net/e1000e.c | 1 | ||||
| -rw-r--r-- | hw/net/vmxnet3.c | 1 | ||||
| -rw-r--r-- | include/hw/i386/pc.h | 4 | ||||
| -rw-r--r-- | pc-bios/efi-e1000.rom | bin | 196608 -> 209408 bytes | |||
| -rw-r--r-- | pc-bios/efi-e1000e.rom | bin | 0 -> 209408 bytes | |||
| -rw-r--r-- | pc-bios/efi-eepro100.rom | bin | 197120 -> 209920 bytes | |||
| -rw-r--r-- | pc-bios/efi-ne2k_pci.rom | bin | 195584 -> 208384 bytes | |||
| -rw-r--r-- | pc-bios/efi-pcnet.rom | bin | 195584 -> 208384 bytes | |||
| -rw-r--r-- | pc-bios/efi-rtl8139.rom | bin | 199168 -> 211456 bytes | |||
| -rw-r--r-- | pc-bios/efi-virtio.rom | bin | 193024 -> 211456 bytes | |||
| -rw-r--r-- | pc-bios/efi-vmxnet3.rom | bin | 0 -> 205312 bytes | |||
| -rw-r--r-- | roms/Makefile | 8 | ||||
| m--------- | roms/ipxe | 0 |
14 files changed, 14 insertions, 3 deletions
diff --git a/Makefile b/Makefile index 9d12dc614f..c054bc6356 100644 --- a/Makefile +++ b/Makefile @@ -30,7 +30,7 @@ CONFIG_ALL=y -include config-all-devices.mak -include config-all-disas.mak -config-host.mak: $(SRC_PATH)/configure +config-host.mak: $(SRC_PATH)/configure $(SRC_PATH)/pc-bios @echo $@ is out-of-date, running configure @# TODO: The next lines include code which supports a smooth @# transition from old configurations without config.status. @@ -416,6 +416,7 @@ pxe-e1000.rom pxe-eepro100.rom pxe-ne2k_pci.rom \ pxe-pcnet.rom pxe-rtl8139.rom pxe-virtio.rom \ efi-e1000.rom efi-eepro100.rom efi-ne2k_pci.rom \ efi-pcnet.rom efi-rtl8139.rom efi-virtio.rom \ +efi-e1000e.rom efi-vmxnet3.rom \ qemu-icon.bmp qemu_logo_no_text.svg \ bamboo.dtb petalogix-s3adsp1800.dtb petalogix-ml605.dtb \ multiboot.bin linuxboot.bin kvmvapic.bin \ diff --git a/hw/net/e1000e.c b/hw/net/e1000e.c index 692283fdd7..47787447cd 100644 --- a/hw/net/e1000e.c +++ b/hw/net/e1000e.c @@ -693,6 +693,7 @@ static void e1000e_class_init(ObjectClass *class, void *data) c->vendor_id = PCI_VENDOR_ID_INTEL; c->device_id = E1000_DEV_ID_82574L; c->revision = 0; + c->romfile = "efi-e1000e.rom"; c->class_id = PCI_CLASS_NETWORK_ETHERNET; c->is_express = 1; diff --git a/hw/net/vmxnet3.c b/hw/net/vmxnet3.c index 92236d3919..b8e3b25053 100644 --- a/hw/net/vmxnet3.c +++ b/hw/net/vmxnet3.c @@ -2719,6 +2719,7 @@ static void vmxnet3_class_init(ObjectClass *class, void *data) c->vendor_id = PCI_VENDOR_ID_VMWARE; c->device_id = PCI_DEVICE_ID_VMWARE_VMXNET3; c->revision = PCI_DEVICE_ID_VMWARE_VMXNET3_REVISION; + c->romfile = "efi-vmxnet3.rom"; c->class_id = PCI_CLASS_NETWORK_ETHERNET; c->subsystem_vendor_id = PCI_VENDOR_ID_VMWARE; c->subsystem_id = PCI_DEVICE_ID_VMWARE_VMXNET3; diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 7e43b20b4b..fe5444dfb6 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -374,6 +374,10 @@ bool e820_get_entry(int, uint32_t, uint64_t *, uint64_t *); .driver = TYPE_X86_CPU,\ .property = "cpuid-0xb",\ .value = "off",\ + },{\ + .driver = "vmxnet3",\ + .property = "romfile",\ + .value = "",\ }, #define PC_COMPAT_2_5 \ diff --git a/pc-bios/efi-e1000.rom b/pc-bios/efi-e1000.rom index 4bc89a3d25..4e61f9b2df 100644 --- a/pc-bios/efi-e1000.rom +++ b/pc-bios/efi-e1000.rom Binary files differdiff --git a/pc-bios/efi-e1000e.rom b/pc-bios/efi-e1000e.rom new file mode 100644 index 0000000000..192a43729d --- /dev/null +++ b/pc-bios/efi-e1000e.rom Binary files differdiff --git a/pc-bios/efi-eepro100.rom b/pc-bios/efi-eepro100.rom index 85b7f9bc7f..66c52269cd 100644 --- a/pc-bios/efi-eepro100.rom +++ b/pc-bios/efi-eepro100.rom Binary files differdiff --git a/pc-bios/efi-ne2k_pci.rom b/pc-bios/efi-ne2k_pci.rom index ebafd84521..8c3e5fd6d1 100644 --- a/pc-bios/efi-ne2k_pci.rom +++ b/pc-bios/efi-ne2k_pci.rom Binary files differdiff --git a/pc-bios/efi-pcnet.rom b/pc-bios/efi-pcnet.rom index 6f19723751..802e225cb5 100644 --- a/pc-bios/efi-pcnet.rom +++ b/pc-bios/efi-pcnet.rom Binary files differdiff --git a/pc-bios/efi-rtl8139.rom b/pc-bios/efi-rtl8139.rom index 086551b760..8827181f31 100644 --- a/pc-bios/efi-rtl8139.rom +++ b/pc-bios/efi-rtl8139.rom Binary files differdiff --git a/pc-bios/efi-virtio.rom b/pc-bios/efi-virtio.rom index 140c6806db..2fc0497958 100644 --- a/pc-bios/efi-virtio.rom +++ b/pc-bios/efi-virtio.rom Binary files differdiff --git a/pc-bios/efi-vmxnet3.rom b/pc-bios/efi-vmxnet3.rom new file mode 100644 index 0000000000..3d42635d16 --- /dev/null +++ b/pc-bios/efi-vmxnet3.rom Binary files differdiff --git a/roms/Makefile b/roms/Makefile index 7bd1252737..88b3709d4d 100644 --- a/roms/Makefile +++ b/roms/Makefile @@ -1,11 +1,13 @@ vgabios_variants := stdvga cirrus vmware qxl isavga virtio vgabios_targets := $(subst -isavga,,$(patsubst %,vgabios-%.bin,$(vgabios_variants))) -pxerom_variants := e1000 eepro100 ne2k_pci pcnet rtl8139 virtio -pxerom_targets := 8086100e 80861209 10500940 10222000 10ec8139 1af41000 +pxerom_variants := e1000 e1000e eepro100 ne2k_pci pcnet rtl8139 virtio vmxnet3 +pxerom_targets := 8086100e 808610d3 80861209 10500940 10222000 10ec8139 1af41000 15ad07b0 pxe-rom-e1000 efi-rom-e1000 : VID := 8086 pxe-rom-e1000 efi-rom-e1000 : DID := 100e +pxe-rom-e1000e efi-rom-e1000e : VID := 8086 +pxe-rom-e1000e efi-rom-e1000e : DID := 10d3 pxe-rom-eepro100 efi-rom-eepro100 : VID := 8086 pxe-rom-eepro100 efi-rom-eepro100 : DID := 1209 pxe-rom-ne2k_pci efi-rom-ne2k_pci : VID := 1050 @@ -16,6 +18,8 @@ pxe-rom-rtl8139 efi-rom-rtl8139 : VID := 10ec pxe-rom-rtl8139 efi-rom-rtl8139 : DID := 8139 pxe-rom-virtio efi-rom-virtio : VID := 1af4 pxe-rom-virtio efi-rom-virtio : DID := 1000 +pxe-rom-vmxnet3 efi-rom-vmxnet3 : VID := 15ad +pxe-rom-vmxnet3 efi-rom-vmxnet3 : DID := 07b0 # # cross compiler auto detection diff --git a/roms/ipxe b/roms/ipxe -Subproject 4e03af8ec2d497e725566a91fd5c19dd604c18a +Subproject 04186319181298083ef28695a8309028b26fe83 |