From patchwork Thu Feb 25 14:56:13 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 8424331 Return-Path: X-Original-To: patchwork-xen-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 61B8CC0553 for ; Thu, 25 Feb 2016 15:06:12 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5F4FE2028D for ; Thu, 25 Feb 2016 15:06:11 +0000 (UTC) Received: from lists.xen.org (unknown [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 8B91D2035B for ; Thu, 25 Feb 2016 15:06:10 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.84) (envelope-from ) id 1aYxS2-0003ie-RM; Thu, 25 Feb 2016 15:03:34 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.84) (envelope-from ) id 1aYxS1-0003hH-6n for xen-devel@lists.xen.org; Thu, 25 Feb 2016 15:03:33 +0000 Received: from [193.109.254.147] by server-1.bemta-14.messagelabs.com id 93/CD-02901-4C71FC65; Thu, 25 Feb 2016 15:03:32 +0000 X-Env-Sender: prvs=85652c963=anthony.perard@citrix.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1456412610!26625636!1 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAzMDYwNDg=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 47065 invoked from network); 25 Feb 2016 15:03:31 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-9.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 25 Feb 2016 15:03:31 -0000 X-IronPort-AV: E=Sophos;i="5.22,498,1449532800"; d="scan'208";a="341083641" From: Anthony PERARD To: Date: Thu, 25 Feb 2016 14:56:13 +0000 Message-ID: <1456412174-20162-16-git-send-email-anthony.perard@citrix.com> X-Mailer: git-send-email 2.7.1 In-Reply-To: <1456412174-20162-1-git-send-email-anthony.perard@citrix.com> References: <1456412174-20162-1-git-send-email-anthony.perard@citrix.com> MIME-Version: 1.0 X-DLP: MIA2 Cc: Keir Fraser , Stefano Stabellini , Andrew Cooper , Ian Jackson , Jan Beulich , Anthony PERARD , Wei Liu Subject: [Xen-devel] [PATCH v3 15/16] hvmloader: Always build-in SeaBIOS and OVMF loader X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,RDNS_NONE, UNPARSEABLE_RELAY autolearn=no version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Anthony PERARD Acked-by: Jan Beulich --- tools/firmware/hvmloader/Makefile | 11 +---------- tools/firmware/hvmloader/hvmloader.c | 4 ---- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/tools/firmware/hvmloader/Makefile b/tools/firmware/hvmloader/Makefile index dee1c6b..9f7357f 100644 --- a/tools/firmware/hvmloader/Makefile +++ b/tools/firmware/hvmloader/Makefile @@ -37,6 +37,7 @@ OBJS = hvmloader.o mp_tables.o util.o smbios.o OBJS += smp.o cacheattr.o xenbus.o vnuma.o OBJS += e820.o pci.o pir.o ctype.o OBJS += hvm_param.o +OBJS += ovmf.o seabios.o ifeq ($(debug),y) OBJS += tests.o endif @@ -57,11 +58,6 @@ endif ROMS := -ifeq ($(CONFIG_OVMF),y) -OBJS += ovmf.o -CFLAGS += -DENABLE_OVMF -endif - ifeq ($(CONFIG_ROMBIOS),y) OBJS += optionroms.o 32bitbios_support.o rombios.o CFLAGS += -DENABLE_ROMBIOS @@ -69,11 +65,6 @@ ROMBIOS_ROM := $(ROMBIOS_DIR)/BIOS-bochs-latest ROMS += $(ROMBIOS_ROM) $(STDVGA_ROM) $(CIRRUSVGA_ROM) $(ETHERBOOT_ROMS) endif -ifeq ($(CONFIG_SEABIOS),y) -OBJS += seabios.o -CFLAGS += -DENABLE_SEABIOS -endif - .PHONY: all all: subdirs-all $(MAKE) hvmloader diff --git a/tools/firmware/hvmloader/hvmloader.c b/tools/firmware/hvmloader/hvmloader.c index e7b0139..bd774d5 100644 --- a/tools/firmware/hvmloader/hvmloader.c +++ b/tools/firmware/hvmloader/hvmloader.c @@ -210,12 +210,8 @@ struct bios_info { #ifdef ENABLE_ROMBIOS { "rombios", &rombios_config, }, #endif -#ifdef ENABLE_SEABIOS { "seabios", &seabios_config, }, -#endif -#ifdef ENABLE_OVMF { "ovmf", &ovmf_config, }, -#endif { NULL, NULL } };