From patchwork Thu Jul 28 10:50:11 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 9251117 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 73E9860757 for ; Thu, 28 Jul 2016 11:19:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 64F7326D17 for ; Thu, 28 Jul 2016 11:19:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 59EC72723E; Thu, 28 Jul 2016 11:19:10 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id BB42626D17 for ; Thu, 28 Jul 2016 11:19:09 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bSjJ5-0001vu-RD; Thu, 28 Jul 2016 11:16:51 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bSjJ4-0001vI-5F for xen-devel@lists.xen.org; Thu, 28 Jul 2016 11:16:50 +0000 Received: from [85.158.139.211] by server-10.bemta-5.messagelabs.com id BC/BD-19922-1A9E9975; Thu, 28 Jul 2016 11:16:49 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprAIsWRWlGSWpSXmKPExsXitHSDve7ClzP DDV4/5LZY8nExiwOjx9Hdv5kCGKNYM/OS8isSWDPmXH/BWjCJt2JqWxdTA+NK7i5GDg4JAX+J bVe9uxg5OdgEDCRWTL/KCGKLCMhKrO6aw97FyMXBLHCEUeLWzZ9gCWEBH4m2C7NZQWwWAVWJ3 ssHmUFsXgF7iePndrGD2BICchIN5++DxTmB4isP3weLCwnYSRzauJAZwlaTuLFwGQtEr6DEyZ lPwGxmAQmJgy9eMEPcxi3xt9t+AiPfLCRVs5BULWBkWsWoUZxaVJZapGtorJdUlJmeUZKbmJm ja2hgqpebWlycmJ6ak5hUrJecn7uJERhSDECwg/HfNs9DjJIcTEqivGGhM8OF+JLyUyozEosz 4otKc1KLDzHKcHAoSfAKvADKCRalpqdWpGXmAIMbJi3BwaMkwvv4OVCat7ggMbc4Mx0idYpRU UqcVx6kTwAkkVGaB9cGi6hLjLJSwryMQIcI8RSkFuVmlqDKv2IU52BUEuY1AZnCk5lXAjf9Fd BiJqDFxbEzQBaXJCKkpBoYHb7w798zzUr/4Bejqk8q/rHse96an9qpdLLbRLf0Idtcm2OTui/ FPDFZqJf/0mj6428zBR8UfVDsWfv9k0uyz9wDu6Te/Y0SDN8hZRfD139Eef+ffa8i+HufFq2c yHE7svCmgkBYy4xfy0/67l7mEOrkfEtlz3TtkObbtnacVtpiy9rWXzb7p8RSnJFoqMVcVJwIA IYYiPyjAgAA X-Env-Sender: prvs=0100a76d6=anthony.perard@citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1469704602!51885319!2 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: 8.77; banners=-,-,- X-VirusChecked: Checked Received: (qmail 39205 invoked from network); 28 Jul 2016 11:16:48 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-9.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 28 Jul 2016 11:16:48 -0000 X-IronPort-AV: E=Sophos;i="5.28,433,1464652800"; d="scan'208";a="375974233" From: Anthony PERARD To: Date: Thu, 28 Jul 2016 11:50:11 +0100 Message-ID: <20160728105013.22310-14-anthony.perard@citrix.com> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20160728105013.22310-1-anthony.perard@citrix.com> References: <20160728105013.22310-1-anthony.perard@citrix.com> MIME-Version: 1.0 X-DLP: MIA1 Cc: Anthony PERARD , Andrew Cooper , Ian Jackson , Wei Liu , Jan Beulich Subject: [Xen-devel] [PATCH v7 13/15] 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-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 b5f51f6..61875a0 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 } };