diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-09-22 19:22:23 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-09-22 19:22:23 +0100 |
| commit | 27c7275a56948f48f536e2d1599b22355f5714ac (patch) | |
| tree | 6e0771daa335d70a0c42e08e44805e15449fdd57 | |
| parent | 482d7c0854423608e20e56b5824b7340bd3af7df (diff) | |
| parent | f4798320144245da66128edb840bd940fd287d28 (diff) | |
Merge remote-tracking branch 'remotes/kraxel/tags/pull-ipxe-20150903-1' into staging
ipxe: update to 35c53797 to 4e03af8, build tweaks.
# gpg: Signature made Thu 03 Sep 2015 13:52:01 BST using RSA key ID D3E87138
# 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>"
* remotes/kraxel/tags/pull-ipxe-20150903-1:
ipxe: update binaries
ipxe: use upstream configuration
ipxe: don't override GITVERSION
ipxe: update from 35c53797 to 4e03af8
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | pc-bios/efi-e1000.rom | bin | 197120 -> 196608 bytes | |||
| -rw-r--r-- | pc-bios/efi-eepro100.rom | bin | 197632 -> 197120 bytes | |||
| -rw-r--r-- | pc-bios/efi-ne2k_pci.rom | bin | 195584 -> 195584 bytes | |||
| -rw-r--r-- | pc-bios/efi-pcnet.rom | bin | 195584 -> 195584 bytes | |||
| -rw-r--r-- | pc-bios/efi-rtl8139.rom | bin | 200192 -> 199168 bytes | |||
| -rw-r--r-- | pc-bios/efi-virtio.rom | bin | 194048 -> 193024 bytes | |||
| -rw-r--r-- | roms/Makefile | 11 | ||||
| -rw-r--r-- | roms/config.ipxe.general.h | 4 | ||||
| m--------- | roms/ipxe | 0 |
9 files changed, 4 insertions, 11 deletions
diff --git a/pc-bios/efi-e1000.rom b/pc-bios/efi-e1000.rom Binary files differindex 4e29d9d1ad..4bc89a3d25 100644 --- a/pc-bios/efi-e1000.rom +++ b/pc-bios/efi-e1000.rom diff --git a/pc-bios/efi-eepro100.rom b/pc-bios/efi-eepro100.rom Binary files differindex 2a92d6f32f..85b7f9bc7f 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 6366017009..ebafd84521 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 a61f586eeb..6f19723751 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 c9c77ea7f0..086551b760 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 eec2790990..140c6806db 100644 --- a/pc-bios/efi-virtio.rom +++ b/pc-bios/efi-virtio.rom diff --git a/roms/Makefile b/roms/Makefile index 7b3f156321..09e33b59e5 100644 --- a/roms/Makefile +++ b/roms/Makefile @@ -120,20 +120,17 @@ efi-rom-%: build-pxe-roms build-efi-roms -ec ipxe/src/bin-x86_64-efi/$(VID)$(DID).efidrv \ -o ../pc-bios/efi-$*.rom -build-pxe-roms: ipxe/src/config/local/general.h - $(MAKE) -C ipxe/src GITVERSION="" \ +build-pxe-roms: + $(MAKE) -C ipxe/src CONFIG=qemu \ CROSS_COMPILE=$(x86_64_cross_prefix) \ $(patsubst %,bin/%.rom,$(pxerom_targets)) -build-efi-roms: build-pxe-roms ipxe/src/config/local/general.h - $(MAKE) -C ipxe/src GITVERSION="" \ +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)) -ipxe/src/config/local/%: config.ipxe.% - cp $< $@ - slof: $(MAKE) -C SLOF CROSS=$(powerpc64_cross_prefix) qemu diff --git a/roms/config.ipxe.general.h b/roms/config.ipxe.general.h deleted file mode 100644 index 619ee4c157..0000000000 --- a/roms/config.ipxe.general.h +++ /dev/null @@ -1,4 +0,0 @@ -#undef BANNER_TIMEOUT -#define BANNER_TIMEOUT 30 -#undef ROM_BANNER_TIMEOUT -#define ROM_BANNER_TIMEOUT 0 diff --git a/roms/ipxe b/roms/ipxe -Subproject 35c5379760aa1fea5e38f7a78b090f92bb7813e +Subproject 4e03af8ec2d497e725566a91fd5c19dd604c18a |