Re: [PATCH v2 14/18] xenpvh: add build runes for grub-core

[Juergen Gross]

On 22/10/2018 13:41, Daniel Kiper wrote:
> On Tue, Oct 09, 2018 at 01:03:13PM +0200, Juergen Gross wrote:
>> Add the modifications to the build system needed to build a xenpvh
>> grub.
>>
>> Signed-off-by: Juergen Gross <address@hidden>
>> Reviewed-by: Daniel Kiper <address@hidden>
>> ---
>>  gentpl.py                   |  4 ++--
>>  grub-core/Makefile.am       | 12 ++++++++++++
>>  grub-core/Makefile.core.def | 35 +++++++++++++++++++++++++++++++++++
>>  3 files changed, 49 insertions(+), 2 deletions(-)
>>
>> diff --git a/gentpl.py b/gentpl.py
>> index da67965a4..9732b4aee 100644
>> --- a/gentpl.py
>> +++ b/gentpl.py
>> @@ -28,7 +28,7 @@ import re
>>
>>  GRUB_PLATFORMS = [ "emu", "i386_pc", "i386_efi", "i386_qemu", 
>> "i386_coreboot",
>>                     "i386_multiboot", "i386_ieee1275", "x86_64_efi",
>> -                   "i386_xen", "x86_64_xen",
>> +                   "i386_xen", "x86_64_xen", "i386_xenpvh",
> 
> s/i386_xenpvh/i386_xen_pvh/ here and below please...

... which is the answer to the question I had to your request for patch
07. I'll change it accordingly.

> 
>>                     "mips_loongson", "sparc64_ieee1275",
>>                     "powerpc_ieee1275", "mips_arc", "ia64_efi",
>>                     "mips_qemu_mips", "arm_uboot", "arm_efi", "arm64_efi",
>> @@ -71,7 +71,7 @@ GROUPS["videomodules"]   = GRUB_PLATFORMS[:];
>>  for i in GROUPS["videoinkernel"]: GROUPS["videomodules"].remove(i)
>>
>>  # Similar for terminfo
>> -GROUPS["terminfoinkernel"] = [ "emu", "mips_loongson", "mips_arc", 
>> "mips_qemu_mips" ] + GROUPS["xen"] + GROUPS["ieee1275"] + GROUPS["uboot"];
>> +GROUPS["terminfoinkernel"] = [ "emu", "mips_loongson", "mips_arc", 
>> "mips_qemu_mips", "i386_xenpvh" ] + GROUPS["xen"] + GROUPS["ieee1275"] + 
>> GROUPS["uboot"];
>>  GROUPS["terminfomodule"]   = GRUB_PLATFORMS[:];
>>  for i in GROUPS["terminfoinkernel"]: GROUPS["terminfomodule"].remove(i)
>>
>> diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am
>> index f4ff62b76..d4417e2c4 100644
>> --- a/grub-core/Makefile.am
>> +++ b/grub-core/Makefile.am
>> @@ -101,6 +101,18 @@ KERNEL_HEADER_FILES += 
>> $(top_builddir)/include/grub/machine/int.h
>>  KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/i386/tsc.h
>>  endif
>>
>> +if COND_i386_xenpvh
>> +KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/kernel.h
>> +KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/int.h
>> +KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/i386/tsc.h
>> +KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/terminfo.h
>> +KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/extcmd.h
>> +KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/loader.h
>> +KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/lib/arg.h
>> +KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/xen.h
>> +KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/i386/xen/hypercall.h
>> +endif
>> +
>>  if COND_i386_efi
>>  KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/efi/efi.h
>>  KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/efi/disk.h
>> diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
>> index 9590e87d9..c42cebc38 100644
>> --- a/grub-core/Makefile.core.def
>> +++ b/grub-core/Makefile.core.def
>> @@ -79,6 +79,8 @@ kernel = {
>>    i386_xen_ldflags         = '$(TARGET_IMG_BASE_LDOPT),0';
>>    x86_64_xen_ldflags       = '$(TARGET_IMG_LDFLAGS)';
>>    x86_64_xen_ldflags       = '$(TARGET_IMG_BASE_LDOPT),0';
>> +  i386_xenpvh_ldflags      = '$(TARGET_IMG_LDFLAGS)';
>> +  i386_xenpvh_ldflags      = '$(TARGET_IMG_BASE_LDOPT),0x100000';
>>
>>    mips_loongson_ldflags    = '-Wl,-Ttext,0x80200000';
>>    powerpc_ieee1275_ldflags = '-Wl,-Ttext,0x200000';
>> @@ -100,6 +102,7 @@ kernel = {
>>    x86_64_efi_startup = kern/x86_64/efi/startup.S;
>>    i386_xen_startup = kern/i386/xen/startup.S;
>>    x86_64_xen_startup = kern/x86_64/xen/startup.S;
>> +  i386_xenpvh_startup = kern/i386/xen/startup_pvh.S;
>>    i386_qemu_startup = kern/i386/qemu/startup.S;
>>    i386_ieee1275_startup = kern/i386/ieee1275/startup.S;
>>    i386_coreboot_startup = kern/i386/coreboot/startup.S;
>> @@ -177,6 +180,7 @@ kernel = {
>>
>>    i386 = kern/i386/dl.c;
>>    i386_xen = kern/i386/dl.c;
>> +  i386_xenpvh = kern/i386/dl.c;
>>
>>    i386_coreboot = kern/i386/coreboot/init.c;
>>    i386_multiboot = kern/i386/coreboot/init.c;
>> @@ -222,6 +226,14 @@ kernel = {
>>    xen = disk/xen/xendisk.c;
>>    xen = commands/boot.c;
>>
>> +  i386_xenpvh = kern/i386/tsc.c;
>> +  i386_xenpvh = kern/i386/xen/tsc.c;
>> +  i386_xenpvh = commands/boot.c;
>> +  i386_xenpvh = kern/xen/init.c;
>> +  i386_xenpvh = kern/i386/xen/pvh.c;
>> +  i386_xenpvh = term/xen/console.c;
>> +  i386_xenpvh = disk/xen/xendisk.c;
> 
> I would sort all file names here.

Okay.


Juergen