* [PATCH] Signed-off-by: Attilio Rao <attilio.rao@citrix.com>
@ 2012-02-24 18:35 Attilio Rao
2012-02-24 18:52 ` Attilio Rao
2012-02-28 12:41 ` Ian Campbell
0 siblings, 2 replies; 3+ messages in thread
From: Attilio Rao @ 2012-02-24 18:35 UTC (permalink / raw)
To: xen-devel; +Cc: ian.campbell
diff -r adcd6ab160fa -r eb51dd646ce0 tools/firmware/hvmloader/Makefile
--- a/tools/firmware/hvmloader/Makefile Thu Feb 23 10:29:27 2012 +0000
+++ b/tools/firmware/hvmloader/Makefile Fri Feb 24 18:35:37 2012 +0000
@@ -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
diff -r adcd6ab160fa -r eb51dd646ce0 tools/firmware/hvmloader/config.h
--- a/tools/firmware/hvmloader/config.h Thu Feb 23 10:29:27 2012 +0000
+++ b/tools/firmware/hvmloader/config.h Fri Feb 24 18:35:37 2012 +0000
@@ -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)
diff -r adcd6ab160fa -r eb51dd646ce0 tools/firmware/hvmloader/hvmloader.c
--- a/tools/firmware/hvmloader/hvmloader.c Thu Feb 23 10:29:27 2012 +0000
+++ b/tools/firmware/hvmloader/hvmloader.c Fri Feb 24 18:35:37 2012 +0000
@@ -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 }
};
diff -r adcd6ab160fa -r eb51dd646ce0 tools/firmware/hvmloader/ovmf.c
--- a/tools/firmware/hvmloader/ovmf.c Thu Feb 23 10:29:27 2012 +0000
+++ b/tools/firmware/hvmloader/ovmf.c Fri Feb 24 18:35:37 2012 +0000
@@ -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(vo
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,
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] Signed-off-by: Attilio Rao <attilio.rao@citrix.com>
2012-02-24 18:35 [PATCH] Signed-off-by: Attilio Rao <attilio.rao@citrix.com> Attilio Rao
@ 2012-02-24 18:52 ` Attilio Rao
2012-02-28 12:41 ` Ian Campbell
1 sibling, 0 replies; 3+ messages in thread
From: Attilio Rao @ 2012-02-24 18:52 UTC (permalink / raw)
To: xen-devel@lists.xensource.com; +Cc: Ian Campbell
- Per discussion on the mailing list, drop the ovmf32 support and rename
ovmf64 as the more generic name ovmf which becames the official
supported one. Now the ROM has to be copied like that:
Build/OvmfX64/DEBUG_GCC44/FV/OVMF.fd -> tools/firmware/ovmf/ovmf.bin
- 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>
On 24/02/12 18:35, Attilio Rao wrote:
> diff -r adcd6ab160fa -r eb51dd646ce0 tools/firmware/hvmloader/Makefile
> --- a/tools/firmware/hvmloader/Makefile Thu Feb 23 10:29:27 2012 +0000
> +++ b/tools/firmware/hvmloader/Makefile Fri Feb 24 18:35:37 2012 +0000
> @@ -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
>
> diff -r adcd6ab160fa -r eb51dd646ce0 tools/firmware/hvmloader/config.h
> --- a/tools/firmware/hvmloader/config.h Thu Feb 23 10:29:27 2012 +0000
> +++ b/tools/firmware/hvmloader/config.h Fri Feb 24 18:35:37 2012 +0000
> @@ -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)
> diff -r adcd6ab160fa -r eb51dd646ce0 tools/firmware/hvmloader/hvmloader.c
> --- a/tools/firmware/hvmloader/hvmloader.c Thu Feb 23 10:29:27 2012 +0000
> +++ b/tools/firmware/hvmloader/hvmloader.c Fri Feb 24 18:35:37 2012 +0000
> @@ -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 }
> };
> diff -r adcd6ab160fa -r eb51dd646ce0 tools/firmware/hvmloader/ovmf.c
> --- a/tools/firmware/hvmloader/ovmf.c Thu Feb 23 10:29:27 2012 +0000
> +++ b/tools/firmware/hvmloader/ovmf.c Fri Feb 24 18:35:37 2012 +0000
> @@ -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(vo
> 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,
>
> _______________________________________________
> Xen-devel mailing list
> Xen-devel@lists.xen.org
> http://lists.xen.org/xen-devel
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] Signed-off-by: Attilio Rao <attilio.rao@citrix.com>
2012-02-24 18:35 [PATCH] Signed-off-by: Attilio Rao <attilio.rao@citrix.com> Attilio Rao
2012-02-24 18:52 ` Attilio Rao
@ 2012-02-28 12:41 ` Ian Campbell
1 sibling, 0 replies; 3+ messages in thread
From: Ian Campbell @ 2012-02-28 12:41 UTC (permalink / raw)
To: Attilio Rao; +Cc: xen-devel@lists.xensource.com
> - Per discussion on the mailing list, drop the ovmf32 support and
> rename
> ovmf64 as the more generic name ovmf which becames the official
> supported one. Now the ROM has to be copied like that:
>
> Build/OvmfX64/DEBUG_GCC44/FV/OVMF.fd -> tools/firmware/ovmf/ovmf.bin
>
> - 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>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-02-28 12:41 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-02-24 18:35 [PATCH] Signed-off-by: Attilio Rao <attilio.rao@citrix.com> Attilio Rao
2012-02-24 18:52 ` Attilio Rao
2012-02-28 12:41 ` Ian Campbell
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.