Commit 60a0f1af authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/kraxel/tags/pull-ipxe-20160704-1' into staging 



ipxe: update submodule from 4e03af8ec to 041863191
e1000e+vmxnet3: add boot rom

# gpg: Signature made Mon 04 Jul 2016 07:25:46 BST
# gpg:                using RSA key 0x4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>"
# Primary key fingerprint: A032 8CFF B93A 17A7 9901  FE7D 4CB6 D8EE D3E8 7138

* remotes/kraxel/tags/pull-ipxe-20160704-1:
  build: add pc-bios to config-host.mak deps
  ipxe: add new roms to BLOBS
  ipxe: update prebuilt binaries
  vmxnet3: add boot rom
  e1000e: add boot rom
  ipxe: add vmxnet3 rom
  ipxe: add e1000e rom
  ipxe: update submodule from 4e03af8ec to 041863191

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 8662d7db 8df42d85

Makefile

+2 −1
Original line number Diff line number Diff line
@@ -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 \

hw/net/e1000e.c

+1 −0
Original line number Diff line number Diff line
@@ -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;

hw/net/vmxnet3.c

+1 −0
Original line number Diff line number Diff line
@@ -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;

include/hw/i386/pc.h

+4 −0
Original line number Diff line number Diff line
@@ -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 \

pc-bios/efi-e1000.rom

+12.5 KiB (205 KiB)

File changed.

No diff preview for this file type.

View original file
View changed file