66 lines
1.9 KiB
Diff
66 lines
1.9 KiB
Diff
|
From e7497ead178f01fd5c94cfb8506d31b77cc38c94 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Anthony PERARD <anthony.perard@citrix.com>
|
||
|
|
Date: Mon, 14 Mar 2016 17:55:48 +0000
|
||
|
|
Subject: [PATCH 13/15] hvmloader: Always build-in SeaBIOS and OVMF loader
|
||
|
|
|
||
|
|
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(-)
|
||
|
|
|
||
|
|
Index: xen-4.7.0-testing/tools/firmware/hvmloader/Makefile
|
||
|
|
===================================================================
|
||
|
|
--- xen-4.7.0-testing.orig/tools/firmware/hvmloader/Makefile
|
||
|
|
+++ xen-4.7.0-testing/tools/firmware/hvmloader/Makefile
|
||
|
|
@@ -37,6 +37,7 @@ OBJS = hvmloader.o mp_tables.o util.o s
|
||
|
|
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
|
||
|
|
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
|
||
|
|
Index: xen-4.7.0-testing/tools/firmware/hvmloader/hvmloader.c
|
||
|
|
===================================================================
|
||
|
|
--- xen-4.7.0-testing.orig/tools/firmware/hvmloader/hvmloader.c
|
||
|
|
+++ xen-4.7.0-testing/tools/firmware/hvmloader/hvmloader.c
|
||
|
|
@@ -209,12 +209,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 }
|
||
|
|
};
|
||
|
|
|