mirror of
https://github.com/xen-project/xen.git
synced 2026-10-28 10:11:27 +01:00
hvmloader: drop the ovmf32 support and rename ovmf64 -> ovmf.
- Remove the 15cpus hack from ovmf because it should be unnecessary on nowadays windows/EFI supported. Signed-off-by: Attilio Rao <attilio.rao@citrix.com> Acked-by: Ian Campbell <ian.campbell@citrix.com> Committed-by: Keir Fraser <keir@xen.org>
This commit is contained in:
Attilio Rao committed
1 parent
7802d99398
commit
0c2dccd724
4 files changed
+18
-52
No files matched your search
@@ -55,10 +55,9 @@ ROMS :=
|
||||
|
||||
ifeq ($(CONFIG_OVMF),y)
|
||||
OBJS += ovmf.o
|
||||
CFLAGS += -DENABLE_OVMF32 -DENABLE_OVMF64
|
||||
OVMF32_ROM := $(OVMF_DIR)/ovmf-ia32.bin
|
||||
OVMF64_ROM := $(OVMF_DIR)/ovmf-x64.bin
|
||||
ROMS += $(OVMF32_ROM) $(OVMF64_ROM)
|
||||
CFLAGS += -DENABLE_OVMF
|
||||
OVMF_ROM := $(OVMF_DIR)/ovmf.bin
|
||||
ROMS += $(OVMF_ROM)
|
||||
endif
|
||||
|
||||
ifeq ($(CONFIG_ROMBIOS),y)
|
||||
@@ -102,15 +101,9 @@ ifneq ($(SEABIOS_ROM),)
|
||||
echo "#endif" >> $@.new
|
||||
endif
|
||||
|
||||
ifneq ($(OVMF32_ROM),)
|
||||
echo "#ifdef ROM_INCLUDE_OVMF32" >> $@.new
|
||||
sh ./mkhex ovmf32 $(OVMF32_ROM) >> $@.new
|
||||
echo "#endif" >> $@.new
|
||||
endif
|
||||
|
||||
ifneq ($(OVMF64_ROM),)
|
||||
echo "#ifdef ROM_INCLUDE_OVMF64" >> $@.new
|
||||
sh ./mkhex ovmf64 $(OVMF64_ROM) >> $@.new
|
||||
ifneq ($(OVMF_ROM),)
|
||||
echo "#ifdef ROM_INCLUDE_OVMF" >> $@.new
|
||||
sh ./mkhex ovmf $(OVMF_ROM) >> $@.new
|
||||
echo "#endif" >> $@.new
|
||||
endif
|
||||
|
||||
|
||||
@@ -35,8 +35,7 @@ struct bios_config {
|
||||
|
||||
extern struct bios_config rombios_config;
|
||||
extern struct bios_config seabios_config;
|
||||
extern struct bios_config ovmf32_config;
|
||||
extern struct bios_config ovmf64_config;
|
||||
extern struct bios_config ovmf_config;
|
||||
|
||||
#define PAGE_SHIFT 12
|
||||
#define PAGE_SIZE (1ul << PAGE_SHIFT)
|
||||
|
||||
@@ -212,11 +212,8 @@ struct bios_info {
|
||||
#ifdef ENABLE_SEABIOS
|
||||
{ "seabios", &seabios_config, },
|
||||
#endif
|
||||
#ifdef ENABLE_OVMF32
|
||||
{ "ovmf-ia32", &ovmf32_config, },
|
||||
#endif
|
||||
#ifdef ENABLE_OVMF64
|
||||
{ "ovmf-x64", &ovmf64_config, },
|
||||
#ifdef ENABLE_OVMF
|
||||
{ "ovmf", &ovmf_config, },
|
||||
#endif
|
||||
{ NULL, NULL }
|
||||
};
|
||||
|
||||
@@ -35,8 +35,7 @@
|
||||
#include <xen/hvm/ioreq.h>
|
||||
#include <xen/memory.h>
|
||||
|
||||
#define ROM_INCLUDE_OVMF32
|
||||
#define ROM_INCLUDE_OVMF64
|
||||
#define ROM_INCLUDE_OVMF
|
||||
#include "roms.inc"
|
||||
|
||||
#define OVMF_BEGIN 0xFFF00000ULL
|
||||
@@ -48,8 +47,8 @@
|
||||
#define LOWCHUNK_MAXOFFSET 0x0000FFFF
|
||||
#define LOWCHUNK_END (OVMF_BEGIN + OVMF_SIZE)
|
||||
|
||||
extern unsigned char dsdt_anycpu[], dsdt_15cpu[];
|
||||
extern int dsdt_anycpu_len, dsdt_15cpu_len;
|
||||
extern unsigned char dsdt_anycpu[];
|
||||
extern int dsdt_anycpu_len;
|
||||
|
||||
static void ovmf_load(const struct bios_config *config)
|
||||
{
|
||||
@@ -79,8 +78,8 @@ static void ovmf_acpi_build_tables(void)
|
||||
struct acpi_config config = {
|
||||
.dsdt_anycpu = dsdt_anycpu,
|
||||
.dsdt_anycpu_len = dsdt_anycpu_len,
|
||||
.dsdt_15cpu = dsdt_15cpu,
|
||||
.dsdt_15cpu_len = dsdt_15cpu_len,
|
||||
.dsdt_15cpu = NULL,
|
||||
.dsdt_15cpu_len = 0
|
||||
};
|
||||
|
||||
acpi_build_tables(&config, ACPI_PHYSICAL_ADDRESS);
|
||||
@@ -94,33 +93,11 @@ static void ovmf_create_smbios_tables(void)
|
||||
SMBIOS_PHYSICAL_END);
|
||||
}
|
||||
|
||||
struct bios_config ovmf32_config = {
|
||||
.name = "OVMF-IA32",
|
||||
struct bios_config ovmf_config = {
|
||||
.name = "OVMF",
|
||||
|
||||
.image = ovmf32,
|
||||
.image_size = sizeof(ovmf32),
|
||||
|
||||
.bios_address = 0,
|
||||
.bios_load = ovmf_load,
|
||||
|
||||
.load_roms = 0,
|
||||
|
||||
.bios_info_setup = NULL,
|
||||
.bios_info_finish = NULL,
|
||||
|
||||
.e820_setup = NULL,
|
||||
|
||||
.acpi_build_tables = ovmf_acpi_build_tables,
|
||||
.create_mp_tables = NULL,
|
||||
.create_smbios_tables = ovmf_create_smbios_tables,
|
||||
.create_pir_tables = NULL,
|
||||
};
|
||||
|
||||
struct bios_config ovmf64_config = {
|
||||
.name = "OVMF-X64",
|
||||
|
||||
.image = ovmf64,
|
||||
.image_size = sizeof(ovmf64),
|
||||
.image = ovmf,
|
||||
.image_size = sizeof(ovmf),
|
||||
|
||||
.bios_address = 0,
|
||||
.bios_load = ovmf_load,
|
||||
|
||||