From patchwork Mon Mar 25 08:18:31 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 230587 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 7D2BB2C00A7 for ; Mon, 25 Mar 2013 19:20:00 +1100 (EST) Received: from localhost ([::1]:60687 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UK2dK-0005DS-MW for incoming@patchwork.ozlabs.org; Mon, 25 Mar 2013 04:19:58 -0400 Received: from eggs.gnu.org ([208.118.235.92]:55874) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UK2c1-0003F6-Fx for qemu-devel@nongnu.org; Mon, 25 Mar 2013 04:18:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UK2bz-0007wr-H8 for qemu-devel@nongnu.org; Mon, 25 Mar 2013 04:18:37 -0400 Received: from mx1.redhat.com ([209.132.183.28]:29846) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UK2bz-0007wT-9G for qemu-devel@nongnu.org; Mon, 25 Mar 2013 04:18:35 -0400 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r2P8IYTJ006329 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 25 Mar 2013 04:18:34 -0400 Received: from rincewind.home.kraxel.org (ovpn-116-52.ams2.redhat.com [10.36.116.52]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r2P8IWLs026267; Mon, 25 Mar 2013 04:18:33 -0400 Received: by rincewind.home.kraxel.org (Postfix, from userid 500) id 66B4540C83; Mon, 25 Mar 2013 09:18:32 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Mon, 25 Mar 2013 09:18:31 +0100 Message-Id: <1364199512-20742-2-git-send-email-kraxel@redhat.com> In-Reply-To: <1364199512-20742-1-git-send-email-kraxel@redhat.com> References: <1364199512-20742-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: jan.kiszka@web.de, Gerd Hoffmann Subject: [Qemu-devel] [PATCH 1/2] ipxe: disable two second timeout X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Gerd Hoffmann --- roms/Makefile | 7 +++++-- roms/config.ipxe.general.h | 2 ++ 2 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 roms/config.ipxe.general.h diff --git a/roms/Makefile b/roms/Makefile index 3dc5609..7a228ae 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 0000000..b3fce53 --- /dev/null +++ b/roms/config.ipxe.general.h @@ -0,0 +1,2 @@ +#undef BANNER_TIMEOUT +#define BANNER_TIMEOUT 0