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>

diff --git a/pc-bios/efi-e1000.rom b/pc-bios/efi-e1000.rom
index 675992428d07da4fb2c3e846e4356c30e110b152..4da9de33da08f2e3c156b8680cc76c5c00da1db6 100644 (file)
Binary files a/pc-bios/efi-e1000.rom and b/pc-bios/efi-e1000.rom differ

diff --git a/pc-bios/efi-e1000e.rom b/pc-bios/efi-e1000e.rom
index 145896c219220482f0e330643f60e69acee1e6bd..c2474a8fabcf27676c6cd92c84508ed5467868cf 100644 (file)
Binary files a/pc-bios/efi-e1000e.rom and b/pc-bios/efi-e1000e.rom differ

diff --git a/pc-bios/efi-eepro100.rom b/pc-bios/efi-eepro100.rom
index ff2793f9748779d5fe5844cf6413c4d18ca50dda..7950faf7cdca1be69635fb446678a7cb2a3b9615 100644 (file)
Binary files a/pc-bios/efi-eepro100.rom and b/pc-bios/efi-eepro100.rom differ

diff --git a/pc-bios/efi-ne2k_pci.rom b/pc-bios/efi-ne2k_pci.rom
index c832ec017eb633cd3a3f3bc5e658b6b245e3bf08..30edb1392ac085919ba7fb039a5988d3c93d4734 100644 (file)
Binary files a/pc-bios/efi-ne2k_pci.rom and b/pc-bios/efi-ne2k_pci.rom differ

diff --git a/pc-bios/efi-pcnet.rom b/pc-bios/efi-pcnet.rom
index 4d803d30bc77c55b855f9e42ceec1a3afda252b9..23057c5724a3eda8ac15519ee604d2b0050944d4 100644 (file)
Binary files a/pc-bios/efi-pcnet.rom and b/pc-bios/efi-pcnet.rom differ

diff --git a/pc-bios/efi-rtl8139.rom b/pc-bios/efi-rtl8139.rom
index 83488cd54bb2f4697050726a2c87abe98139b9aa..beb9301839e4b7cf21fb041753771c9979635298 100644 (file)
Binary files a/pc-bios/efi-rtl8139.rom and b/pc-bios/efi-rtl8139.rom differ

diff --git a/pc-bios/efi-virtio.rom b/pc-bios/efi-virtio.rom
index 3563776dbd6ea9eec7735381df17ca3b143b5214..f4de5957ec7bda920bf19b26a645f5a4038a1437 100644 (file)
Binary files a/pc-bios/efi-virtio.rom and b/pc-bios/efi-virtio.rom differ

diff --git a/pc-bios/efi-vmxnet3.rom b/pc-bios/efi-vmxnet3.rom
index e22275253b5f16a06e2ae6fc2ededef7dec80e56..7501477ea6d56a4897c326680892072296c91be9 100644 (file)
Binary files a/pc-bios/efi-vmxnet3.rom and b/pc-bios/efi-vmxnet3.rom differ

diff --git a/roms/ipxe b/roms/ipxe
index b991c67c1d91574ef22336cc3a5944d1e63230c9..0600d3ae94f93efd10fc6b3c7420a9557a3a1670 160000 (submodule)
--- a/roms/ipxe
+++ b/roms/ipxe
@@ -1 +1 @@
-Subproject commit b991c67c1d91574ef22336cc3a5944d1e63230c9
+Subproject commit 0600d3ae94f93efd10fc6b3c7420a9557a3a1670