[Qemu-devel] [PATCH 3/4] ipxe: use upstream configuration

[Gerd Hoffmann]

Upstream supports named configurations now and ships with
settings for qemu.  Use them, drop our config header copying.

Signed-off-by: Gerd Hoffmann <address@hidden>
---
 roms/Makefile              | 11 ++++-------
 roms/config.ipxe.general.h |  4 ----
 2 files changed, 4 insertions(+), 11 deletions(-)
 delete mode 100644 roms/config.ipxe.general.h

diff --git a/roms/Makefile b/roms/Makefile
index eb13836..09e33b5 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 619ee4c..0000000
--- 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
-- 
1.8.3.1