diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-09-08 21:21:13 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-09-08 21:21:13 +0100 |
| commit | 9435a8b3dd35f1f926f1b9127e8a906217a5518a (patch) | |
| tree | 3f5dc88f9c853f0dfe6ed2f7875f5ccb8685f1d6 | |
| parent | 6779038537360e957dbded830f76b08ef5070161 (diff) | |
| parent | 3e570a9ae9b966362596fd649f2cbcff0b2199c9 (diff) | |
Merge remote-tracking branch 'remotes/kraxel/tags/sirius/ipxe-20200908-pull-request' into staging
ipxe: update to aug 2020 snapshot.
# gpg: Signature made Tue 08 Sep 2020 07:09:26 BST
# gpg: using RSA key 4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>" [full]
# gpg: aka "Gerd Hoffmann <gerd@kraxel.org>" [full]
# gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>" [full]
# Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138
* remotes/kraxel/tags/sirius/ipxe-20200908-pull-request:
ipxe: update binaries
ipxe: drop ia32 efi roms
ipxe: update submodule
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | pc-bios/efi-e1000.rom | bin | 240128 -> 159232 bytes | |||
| -rw-r--r-- | pc-bios/efi-e1000e.rom | bin | 240128 -> 159232 bytes | |||
| -rw-r--r-- | pc-bios/efi-eepro100.rom | bin | 240128 -> 159232 bytes | |||
| -rw-r--r-- | pc-bios/efi-ne2k_pci.rom | bin | 238592 -> 157696 bytes | |||
| -rw-r--r-- | pc-bios/efi-pcnet.rom | bin | 238592 -> 157696 bytes | |||
| -rw-r--r-- | pc-bios/efi-rtl8139.rom | bin | 242688 -> 160768 bytes | |||
| -rw-r--r-- | pc-bios/efi-virtio.rom | bin | 242688 -> 160768 bytes | |||
| -rw-r--r-- | pc-bios/efi-vmxnet3.rom | bin | 236032 -> 156672 bytes | |||
| -rw-r--r-- | roms/Makefile | 2 | ||||
| m--------- | roms/ipxe | 0 |
10 files changed, 0 insertions, 2 deletions
diff --git a/pc-bios/efi-e1000.rom b/pc-bios/efi-e1000.rom Binary files differindex 6f088d41dd..6312b11c2f 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 f536bdbd45..1f9e0e9dd8 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 64d8891485..c7ccfc4fd7 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 02ad0cb505..93d5b45d37 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 88d25fa625..783bf5b304 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 53f125e3bb..debcf30acd 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 a87321e928..70e8588ccd 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 d017cafe22..ebf59ef737 100644 --- a/pc-bios/efi-vmxnet3.rom +++ b/pc-bios/efi-vmxnet3.rom diff --git a/roms/Makefile b/roms/Makefile index 5d9f15b677..8cafced348 100644 --- a/roms/Makefile +++ b/roms/Makefile @@ -113,7 +113,6 @@ efirom: $(patsubst %,efi-rom-%,$(pxerom_variants)) efi-rom-%: build-pxe-roms build-efi-roms edk2-basetools $(EDK2_EFIROM) -f "0x$(VID)" -i "0x$(DID)" -l 0x02 \ -b ipxe/src/bin/$(VID)$(DID).rom \ - -ec ipxe/src/bin-i386-efi/$(VID)$(DID).efidrv \ -ec ipxe/src/bin-x86_64-efi/$(VID)$(DID).efidrv \ -o ../pc-bios/efi-$*.rom @@ -125,7 +124,6 @@ build-pxe-roms: build-efi-roms: build-pxe-roms $(MAKE) -C ipxe/src CONFIG=qemu \ CROSS_COMPILE=$(x86_64_cross_prefix) \ - $(patsubst %,bin-i386-efi/%.efidrv,$(pxerom_targets)) \ $(patsubst %,bin-x86_64-efi/%.efidrv,$(pxerom_targets)) # Build scripts can pass compiler/linker flags to the EDK2 diff --git a/roms/ipxe b/roms/ipxe -Subproject de4565cbe76ea9f7913a01f331be3ee901bb6e1 +Subproject 4bd064de239dab2426b31c9789a1f4d78087dc6 |