aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2017-07-17 15:05:29 +0100
committerPeter Maydell <peter.maydell@linaro.org>2017-07-17 15:05:29 +0100
commit1f244ebbba650b82828b6139377d6199fe648d6b (patch)
treee2535977163606d0faabaea0658811e2899d8fa0
parent73663d71ef2bab201475d58e17f0c7fe4baefb3f (diff)
parent18375b5c1655d3ce0c5029404a4c993ac04c9d09 (diff)
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.rombin209920 -> 240128 bytes
-rw-r--r--pc-bios/efi-e1000e.rombin209920 -> 240128 bytes
-rw-r--r--pc-bios/efi-eepro100.rombin209920 -> 240128 bytes
-rw-r--r--pc-bios/efi-ne2k_pci.rombin208896 -> 238080 bytes
-rw-r--r--pc-bios/efi-pcnet.rombin208896 -> 238080 bytes
-rw-r--r--pc-bios/efi-rtl8139.rombin212480 -> 241664 bytes
-rw-r--r--pc-bios/efi-virtio.rombin212480 -> 242176 bytes
-rw-r--r--pc-bios/efi-vmxnet3.rombin206848 -> 236032 bytes
m---------roms/ipxe0
9 files changed, 0 insertions, 0 deletions
diff --git a/pc-bios/efi-e1000.rom b/pc-bios/efi-e1000.rom
index 675992428d..4da9de33da 100644
--- a/pc-bios/efi-e1000.rom
+++ b/pc-bios/efi-e1000.rom
Binary files differ
diff --git a/pc-bios/efi-e1000e.rom b/pc-bios/efi-e1000e.rom
index 145896c219..c2474a8fab 100644
--- a/pc-bios/efi-e1000e.rom
+++ b/pc-bios/efi-e1000e.rom
Binary files differ
diff --git a/pc-bios/efi-eepro100.rom b/pc-bios/efi-eepro100.rom
index ff2793f974..7950faf7cd 100644
--- a/pc-bios/efi-eepro100.rom
+++ b/pc-bios/efi-eepro100.rom
Binary files differ
diff --git a/pc-bios/efi-ne2k_pci.rom b/pc-bios/efi-ne2k_pci.rom
index c832ec017e..30edb1392a 100644
--- a/pc-bios/efi-ne2k_pci.rom
+++ b/pc-bios/efi-ne2k_pci.rom
Binary files differ
diff --git a/pc-bios/efi-pcnet.rom b/pc-bios/efi-pcnet.rom
index 4d803d30bc..23057c5724 100644
--- a/pc-bios/efi-pcnet.rom
+++ b/pc-bios/efi-pcnet.rom
Binary files differ
diff --git a/pc-bios/efi-rtl8139.rom b/pc-bios/efi-rtl8139.rom
index 83488cd54b..beb9301839 100644
--- a/pc-bios/efi-rtl8139.rom
+++ b/pc-bios/efi-rtl8139.rom
Binary files differ
diff --git a/pc-bios/efi-virtio.rom b/pc-bios/efi-virtio.rom
index 3563776dbd..f4de5957ec 100644
--- a/pc-bios/efi-virtio.rom
+++ b/pc-bios/efi-virtio.rom
Binary files differ
diff --git a/pc-bios/efi-vmxnet3.rom b/pc-bios/efi-vmxnet3.rom
index e22275253b..7501477ea6 100644
--- a/pc-bios/efi-vmxnet3.rom
+++ b/pc-bios/efi-vmxnet3.rom
Binary files differ
diff --git a/roms/ipxe b/roms/ipxe
-Subproject b991c67c1d91574ef22336cc3a5944d1e63230c
+Subproject 0600d3ae94f93efd10fc6b3c7420a9557a3a167