From patchwork Tue Jul 12 14:42:50 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 9225555 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 4FA226086B for ; Tue, 12 Jul 2016 14:50:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 41A8D27D85 for ; Tue, 12 Jul 2016 14:50:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 362C527F9E; Tue, 12 Jul 2016 14:50:49 +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 8D35827D85 for ; Tue, 12 Jul 2016 14:50:46 +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 1bMyzD-00057h-5X; Tue, 12 Jul 2016 14:48:35 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bMyzB-00056s-Kf for xen-devel@lists.xen.org; Tue, 12 Jul 2016 14:48:33 +0000 Received: from [193.109.254.147] by server-12.bemta-14.messagelabs.com id E8/8A-31201-04305875; Tue, 12 Jul 2016 14:48:32 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprIIsWRWlGSWpSXmKPExsXitHRDpK4Dc2u 4wf3jQhZLPi5mcWD0OLr7N1MAYxRrZl5SfkUCa8ac6y9YCybxVkxt62JqYFzJ3cXIySEh4C+x 7/tUNhCbTcBAYsX0q4wgtoiArMTqrjnsXYxcHMwCRxglbt38CZYQFvCR+HnvGQuIzSKgKvFq0 TNWEJtXwFbi/vL3LBBD5SQazt9nBrE5geJtrU/BbCEBG4m1S2exQthqEjcWLmOB6BWUODnzCZ jNLCAhcfDFC6B6DqA53BJ/u+0nMPLNQlI1C0nVAkamVYwaxalFZalFuobGeklFmekZJbmJmTm 6hoYmermpxcWJ6ak5iUnFesn5uZsYgUFVz8DAuINx13bPQ4ySHExKorzNzC3hQnxJ+SmVGYnF GfFFpTmpxYcYZTg4lCR4TzK2hgsJFqWmp1akZeYAwxsmLcHBoyTC+wUkzVtckJhbnJkOkTrFq CglznscJCEAksgozYNrg8XUJUZZKWFeRgYGBiGegtSi3MwSVPlXjOIcjErCvGdApvBk5pXATX 8FtJgJaHGtQzPI4pJEhJRUA+NarR/Vn+fWrU3W9ebbI/P3jlFcKn/iiZsfLi8oZFW8nPJa/GF BcsXZnfpFUbb1hx5XCfVeOSd1MZMl1vVc0MY+j3CrT1NZrzBa/89tnbKw/VpzmHKQmNPO28sP 7D5z5fO9p7VfNe/MnpYSUMfDMFuyf7tm+RlfoTf73tgm9+lYX4/y12b48E6JpTgj0VCLuag4E QCgKXQbpAIAAA== X-Env-Sender: prvs=994f31c19=anthony.perard@citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1468334910!53311269!1 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAyMDMwMDc=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 8.77; banners=-,-,- X-VirusChecked: Checked Received: (qmail 49915 invoked from network); 12 Jul 2016 14:48:32 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-5.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 12 Jul 2016 14:48:32 -0000 X-IronPort-AV: E=Sophos;i="5.28,352,1464652800"; d="scan'208";a="365727390" From: Anthony PERARD To: Date: Tue, 12 Jul 2016 15:42:50 +0100 Message-ID: <20160712144251.558-14-anthony.perard@citrix.com> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20160712144251.558-1-anthony.perard@citrix.com> References: <20160712144251.558-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 v6 13/14] 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 } };