summaryrefslogtreecommitdiffstats
path: root/roms/Makefile
diff options
context:
space:
mode:
authorGerd Hoffmann2015-09-03 14:40:29 +0200
committerGerd Hoffmann2015-09-03 14:46:24 +0200
commitcf2b4b5b77a7bfe9216efc76117447b88acd47a9 (patch)
tree7e75f36a03c254957d43696ec32466c393ab54d3 /roms/Makefile
parentipxe: don't override GITVERSION (diff)
downloadqemu-cf2b4b5b77a7bfe9216efc76117447b88acd47a9.tar.gz
qemu-cf2b4b5b77a7bfe9216efc76117447b88acd47a9.tar.xz
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/Makefile')
-rw-r--r--roms/Makefile11
1 files changed, 4 insertions, 7 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