diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2015-09-03 14:40:29 +0200 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2015-09-03 14:46:24 +0200 |
| commit | cf2b4b5b77a7bfe9216efc76117447b88acd47a9 (patch) | |
| tree | 7e75f36a03c254957d43696ec32466c393ab54d3 /roms | |
| parent | f927f16213506a493ac416d9a9fa73c7460a766e (diff) | |
| download | qemu-cf2b4b5b77a7bfe9216efc76117447b88acd47a9.tar.gz qemu-cf2b4b5b77a7bfe9216efc76117447b88acd47a9.tar.bz2 qemu-cf2b4b5b77a7bfe9216efc76117447b88acd47a9.zip | |
ipxe: use upstream configuration
Upstream supports named configurations now and ships with
settings for qemu. Use them, drop our config header copying.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Diffstat (limited to 'roms')
| -rw-r--r-- | roms/Makefile | 11 | ||||
| -rw-r--r-- | roms/config.ipxe.general.h | 4 |
2 files changed, 4 insertions, 11 deletions
diff --git a/roms/Makefile b/roms/Makefile index eb138361a2..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 \ +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 \ +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 |