diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2013-03-25 13:13:53 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-03-25 13:13:53 -0500 |
| commit | d2f38a0acb0a1c5b7ab7621a32d603d08d513bea (patch) | |
| tree | 7af9fb8a00ae8c2ac40035b7df611949016c7070 | |
| parent | d63c9477e0cc303492325880dc9977f4096d895d (diff) | |
| parent | 0099cd43ecf07710a608db5ca0945758514a14c2 (diff) | |
Merge remote-tracking branch 'kraxel/ipxe.3' into staging
# By Gerd Hoffmann
# Via Gerd Hoffmann
* kraxel/ipxe.3:
ipxe: update binaries
ipxe: disable two second timeout
| -rw-r--r-- | pc-bios/efi-e1000.rom | bin | 174080 -> 173568 bytes | |||
| -rw-r--r-- | pc-bios/efi-eepro100.rom | bin | 175104 -> 174592 bytes | |||
| -rw-r--r-- | pc-bios/efi-ne2k_pci.rom | bin | 173568 -> 173056 bytes | |||
| -rw-r--r-- | pc-bios/efi-pcnet.rom | bin | 173568 -> 173056 bytes | |||
| -rw-r--r-- | pc-bios/efi-rtl8139.rom | bin | 177152 -> 176640 bytes | |||
| -rw-r--r-- | pc-bios/efi-virtio.rom | bin | 171008 -> 171008 bytes | |||
| -rw-r--r-- | roms/Makefile | 7 | ||||
| -rw-r--r-- | roms/config.ipxe.general.h | 2 |
8 files changed, 7 insertions, 2 deletions
diff --git a/pc-bios/efi-e1000.rom b/pc-bios/efi-e1000.rom Binary files differindex 7dfcea364a..21b880afc2 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 e5134a2fe5..1799c38a83 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 8aa11c370d..5d1b38b9a2 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 200b5d298e..79fa7a9b1d 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 8bcd3c79c6..0b78f1a386 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 25c5c6998d..e6b2bf7242 100644 --- a/pc-bios/efi-virtio.rom +++ b/pc-bios/efi-virtio.rom diff --git a/roms/Makefile b/roms/Makefile index 3dc560921d..7a228aed8f 100644 --- a/roms/Makefile +++ b/roms/Makefile @@ -57,13 +57,13 @@ lgplvgabios-%: pxerom: $(patsubst %,pxe-rom-%,$(pxerom_variants)) -pxe-rom-%: +pxe-rom-%: ipxe/src/config/local/general.h make -C ipxe/src bin/$(VID)$(DID).rom cp ipxe/src/bin/$(VID)$(DID).rom ../pc-bios/pxe-$*.rom efirom: $(patsubst %,efi-rom-%,$(pxerom_variants)) -efi-rom-%: +efi-rom-%: ipxe/src/config/local/general.h make -C ipxe/src bin/$(VID)$(DID).rom make -C ipxe/src bin-i386-efi/$(VID)$(DID).efidrv make -C ipxe/src bin-x86_64-efi/$(VID)$(DID).efidrv @@ -72,3 +72,6 @@ efi-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 + +ipxe/src/config/local/%: config.ipxe.% + cp $< $@ diff --git a/roms/config.ipxe.general.h b/roms/config.ipxe.general.h new file mode 100644 index 0000000000..b3fce5326a --- /dev/null +++ b/roms/config.ipxe.general.h @@ -0,0 +1,2 @@ +#undef BANNER_TIMEOUT +#define BANNER_TIMEOUT 0 |