Commit f7d42093 authored by Anthony Liguori's avatar Anthony Liguori
Browse files

Merge remote-tracking branch 'kraxel/ipxe.2' into staging 

# By Gerd Hoffmann
# Via Gerd Hoffmann
* kraxel/ipxe.2:
  Switch to efi-enabled nic roms by default
  Add efi rom binaries
  Add Makefile rules to build nic rom binaries with efi support
  Update ipxe submodule to latest master
  Add Makefile rules to build nic rom binaries
parents c8a6ae8b c45e5b5b

hw/e1000.c

+1 −1
Original line number Diff line number Diff line
@@ -1378,7 +1378,7 @@ static void e1000_class_init(ObjectClass *klass, void *data) 


    k->init = pci_e1000_init;

    k->exit = pci_e1000_uninit;

    k->romfile = "pxe-e1000.rom";

    k->romfile = "efi-e1000.rom";

    k->vendor_id = PCI_VENDOR_ID_INTEL;

    k->device_id = E1000_DEVID;

    k->revision = 0x03;

hw/ne2000.c

+1 −1
Original line number Diff line number Diff line
@@ -766,7 +766,7 @@ static void ne2000_class_init(ObjectClass *klass, void *data) 


    k->init = pci_ne2000_init;

    k->exit = pci_ne2000_exit;

    k->romfile = "pxe-ne2k_pci.rom",

    k->romfile = "efi-ne2k_pci.rom",

    k->vendor_id = PCI_VENDOR_ID_REALTEK;

    k->device_id = PCI_DEVICE_ID_REALTEK_8029;

    k->class_id = PCI_CLASS_NETWORK_ETHERNET;

hw/pc.h

+22 −2
Original line number Diff line number Diff line
@@ -221,6 +221,26 @@ int e820_add_entry(uint64_t, uint64_t, uint32_t); 
            .property = "vectors",\

            /* DEV_NVECTORS_UNSPECIFIED as a uint32_t string */\

            .value    = stringify(0xFFFFFFFF),\

        },{\

            .driver   = "e1000",\

            .property = "romfile",\

            .value    = "pxe-e1000.rom",\

        },{\

            .driver   = "ne2k_pci",\

            .property = "romfile",\

            .value    = "pxe-ne2k_pci.rom",\

        },{\

            .driver   = "pcnet",\

            .property = "romfile",\

            .value    = "pxe-pcnet.rom",\

        },{\

            .driver   = "rtl8139",\

            .property = "romfile",\

            .value    = "pxe-rtl8139.rom",\

        },{\

            .driver   = "virtio-net-pci",\

            .property = "romfile",\

            .value    = "pxe-virtio.rom",\

        }



#endif

hw/pcnet-pci.c

+1 −1
Original line number Diff line number Diff line
@@ -351,7 +351,7 @@ static void pcnet_class_init(ObjectClass *klass, void *data) 


    k->init = pci_pcnet_init;

    k->exit = pci_pcnet_uninit;

    k->romfile = "pxe-pcnet.rom",

    k->romfile = "efi-pcnet.rom",

    k->vendor_id = PCI_VENDOR_ID_AMD;

    k->device_id = PCI_DEVICE_ID_AMD_LANCE;

    k->revision = 0x10;

hw/rtl8139.c

+1 −1
Original line number Diff line number Diff line
@@ -3530,7 +3530,7 @@ static void rtl8139_class_init(ObjectClass *klass, void *data) 


    k->init = pci_rtl8139_init;

    k->exit = pci_rtl8139_uninit;

    k->romfile = "pxe-rtl8139.rom";

    k->romfile = "efi-rtl8139.rom";

    k->vendor_id = PCI_VENDOR_ID_REALTEK;

    k->device_id = PCI_DEVICE_ID_REALTEK_8139;

    k->revision = RTL8139_PCI_REVID; /* >=0x20 is for 8139C+ */