From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34127) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZYtEy-0001k8-Mj for qemu-devel@nongnu.org; Mon, 07 Sep 2015 06:01:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZYtEw-0001Th-R5 for qemu-devel@nongnu.org; Mon, 07 Sep 2015 06:01:32 -0400 Received: from mx1.redhat.com ([209.132.183.28]:58377) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZYtEw-0001Td-LH for qemu-devel@nongnu.org; Mon, 07 Sep 2015 06:01:30 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (Postfix) with ESMTPS id 4EA24341AFE for ; Mon, 7 Sep 2015 10:01:30 +0000 (UTC) From: Gerd Hoffmann Date: Mon, 7 Sep 2015 12:01:22 +0200 Message-Id: <1441620083-20678-4-git-send-email-kraxel@redhat.com> In-Reply-To: <1441620083-20678-1-git-send-email-kraxel@redhat.com> References: <1441620083-20678-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH 3/4] ipxe: use upstream configuration List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: 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 --- 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