From: Anthony PERARD <anthony.perard@citrix.com>
To: xen-devel@lists.xen.org
Cc: Anthony PERARD <anthony.perard@citrix.com>,
Andrew Cooper <andrew.cooper3@citrix.com>,
Ian Jackson <ian.jackson@eu.citrix.com>,
Wei Liu <wei.liu2@citrix.com>, Jan Beulich <jbeulich@suse.com>
Subject: [PATCH v6 13/14] hvmloader: Always build-in SeaBIOS and OVMF loader
Date: Tue, 12 Jul 2016 15:42:50 +0100 [thread overview]
Message-ID: <20160712144251.558-14-anthony.perard@citrix.com> (raw)
In-Reply-To: <20160712144251.558-1-anthony.perard@citrix.com>
Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
Acked-by: Jan Beulich <jbeulich@suse.com>
---
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 }
};
--
Anthony PERARD
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
next prev parent reply other threads:[~2016-07-12 14:42 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-12 14:42 [PATCH v6 00/14] Load BIOS via toolstack instead of been embedded in hvmloader Anthony PERARD
2016-07-12 14:42 ` [PATCH v6 01/14] libxc: Rework extra module initialisation Anthony PERARD
2016-07-12 15:01 ` Wei Liu
2016-07-12 14:42 ` [PATCH v6 02/14] libxc: Prepare a start info structure for hvmloader Anthony PERARD
2016-07-12 15:01 ` Wei Liu
2016-07-12 14:42 ` [PATCH v6 03/14] configure: #define SEABIOS_PATH and OVMF_PATH Anthony PERARD
2016-07-12 14:42 ` [PATCH v6 04/14] firmware/makefile: install BIOS blob Anthony PERARD
2016-07-12 14:42 ` [PATCH v6 05/14] libxl: Load guest BIOS from file Anthony PERARD
2016-07-12 15:01 ` Wei Liu
2016-07-12 14:42 ` [PATCH v6 06/14] xen: Move the hvm_start_info C representation from libxc to public/xen.h Anthony PERARD
2016-07-12 14:57 ` Wei Liu
2016-07-12 15:09 ` Andrew Cooper
2016-07-12 15:36 ` Anthony PERARD
2016-07-12 16:07 ` Andrew Cooper
2016-07-14 15:55 ` Anthony PERARD
2016-07-12 14:42 ` [PATCH v6 07/14] hvmloader: Grab the hvm_start_info pointer Anthony PERARD
2016-07-12 14:42 ` [PATCH v6 08/14] hvmloader: Locate the BIOS blob Anthony PERARD
2016-07-12 14:42 ` [PATCH v6 09/14] hvmloader: Check modules whereabouts in perform_tests Anthony PERARD
2016-07-12 14:42 ` [PATCH v6 10/14] hvmloader: Load SeaBIOS from hvm_start_info modules Anthony PERARD
2016-07-12 14:42 ` [PATCH v6 11/14] hvmloader: Load OVMF from modules Anthony PERARD
2016-07-12 14:42 ` [PATCH v6 12/14] hvmloader: bios->bios_load() now needs to be defined Anthony PERARD
2016-07-12 14:42 ` Anthony PERARD [this message]
2016-07-12 14:42 ` [PATCH v6 14/14] configure: do not depend on SEABIOS_PATH or OVMF_PATH Anthony PERARD
2016-07-12 15:03 ` [PATCH v6 00/14] Load BIOS via toolstack instead of been embedded in hvmloader Wei Liu
2016-07-12 15:04 ` Wei Liu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160712144251.558-14-anthony.perard@citrix.com \
--to=anthony.perard@citrix.com \
--cc=andrew.cooper3@citrix.com \
--cc=ian.jackson@eu.citrix.com \
--cc=jbeulich@suse.com \
--cc=wei.liu2@citrix.com \
--cc=xen-devel@lists.xen.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).