diff options
author | Peter Maydell <peter.maydell@linaro.org> | 2017-07-17 15:05:29 +0100 |
---|---|---|
committer | Peter Maydell <peter.maydell@linaro.org> | 2017-07-17 15:05:29 +0100 |
commit | 1f244ebbba650b82828b6139377d6199fe648d6b (patch) | |
tree | e2535977163606d0faabaea0658811e2899d8fa0 | |
parent | 73663d71ef2bab201475d58e17f0c7fe4baefb3f (diff) | |
parent | 18375b5c1655d3ce0c5029404a4c993ac04c9d09 (diff) | |
download | qemu-1f244ebbba650b82828b6139377d6199fe648d6b.zip qemu-1f244ebbba650b82828b6139377d6199fe648d6b.tar.gz qemu-1f244ebbba650b82828b6139377d6199fe648d6b.tar.bz2 |
Merge remote-tracking branch 'remotes/kraxel/tags/ipxe-pull-request' into staging
Pull request
# gpg: Signature made Mon 17 Jul 2017 10:04:11 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/ipxe-pull-request:
ipxe: update to commit 0600d3ae94
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
-rw-r--r-- | pc-bios/efi-e1000.rom | bin | 209920 -> 240128 bytes | |||
-rw-r--r-- | pc-bios/efi-e1000e.rom | bin | 209920 -> 240128 bytes | |||
-rw-r--r-- | pc-bios/efi-eepro100.rom | bin | 209920 -> 240128 bytes | |||
-rw-r--r-- | pc-bios/efi-ne2k_pci.rom | bin | 208896 -> 238080 bytes | |||
-rw-r--r-- | pc-bios/efi-pcnet.rom | bin | 208896 -> 238080 bytes | |||
-rw-r--r-- | pc-bios/efi-rtl8139.rom | bin | 212480 -> 241664 bytes | |||
-rw-r--r-- | pc-bios/efi-virtio.rom | bin | 212480 -> 242176 bytes | |||
-rw-r--r-- | pc-bios/efi-vmxnet3.rom | bin | 206848 -> 236032 bytes | |||
m--------- | roms/ipxe | 0 |
9 files changed, 0 insertions, 0 deletions
diff --git a/pc-bios/efi-e1000.rom b/pc-bios/efi-e1000.rom Binary files differindex 6759924..4da9de3 100644 --- a/pc-bios/efi-e1000.rom +++ b/pc-bios/efi-e1000.rom diff --git a/pc-bios/efi-e1000e.rom b/pc-bios/efi-e1000e.rom Binary files differindex 145896c..c2474a8 100644 --- a/pc-bios/efi-e1000e.rom +++ b/pc-bios/efi-e1000e.rom diff --git a/pc-bios/efi-eepro100.rom b/pc-bios/efi-eepro100.rom Binary files differindex ff2793f..7950faf 100644 --- a/pc-bios/efi-eepro100.rom +++ b/pc-bios/efi-eepro100.rom diff --git a/pc-bios/efi-ne2k_pci.rom b/pc-bios/efi-ne2k_pci.rom Binary files differindex c832ec0..30edb13 100644 --- a/pc-bios/efi-ne2k_pci.rom +++ b/pc-bios/efi-ne2k_pci.rom diff --git a/pc-bios/efi-pcnet.rom b/pc-bios/efi-pcnet.rom Binary files differindex 4d803d3..23057c5 100644 --- a/pc-bios/efi-pcnet.rom +++ b/pc-bios/efi-pcnet.rom diff --git a/pc-bios/efi-rtl8139.rom b/pc-bios/efi-rtl8139.rom Binary files differindex 83488cd..beb9301 100644 --- a/pc-bios/efi-rtl8139.rom +++ b/pc-bios/efi-rtl8139.rom diff --git a/pc-bios/efi-virtio.rom b/pc-bios/efi-virtio.rom Binary files differindex 3563776..f4de595 100644 --- a/pc-bios/efi-virtio.rom +++ b/pc-bios/efi-virtio.rom diff --git a/pc-bios/efi-vmxnet3.rom b/pc-bios/efi-vmxnet3.rom Binary files differindex e222752..7501477 100644 --- a/pc-bios/efi-vmxnet3.rom +++ b/pc-bios/efi-vmxnet3.rom diff --git a/roms/ipxe b/roms/ipxe -Subproject b991c67c1d91574ef22336cc3a5944d1e63230c +Subproject 0600d3ae94f93efd10fc6b3c7420a9557a3a167 |