On Mon, Jan 28, 2013 at 3:31 PM, David Woodhouse <[email protected]> wrote: > > Take 2. This time the corresponding flags have actually been merged into > the Linux x86 maintainers' git tree. > > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: David Woodhouse <[email protected]> > --- > OvmfPkg/Include/IndustryStandard/LinuxBzimage.h | 3 ++- > OvmfPkg/Library/LoadLinuxLib/Ia32/JumpToKernel.S | 19 ++++++++++++++++- > OvmfPkg/Library/LoadLinuxLib/Ia32/JumpToKernel.asm | 21 ++++++++++++++++++- > OvmfPkg/Library/LoadLinuxLib/Linux.c | 16 +++++++++++---- > OvmfPkg/Library/LoadLinuxLib/LoadLinuxLib.h | 11 +++++++++- > OvmfPkg/Library/LoadLinuxLib/X64/JumpToKernel.S | 22 ++++++++++++++++++++ > OvmfPkg/Library/LoadLinuxLib/X64/JumpToKernel.asm | 24 > ++++++++++++++++++++++ > 7 files changed, 108 insertions(+), 8 deletions(-) > > diff --git a/OvmfPkg/Include/IndustryStandard/LinuxBzimage.h > b/OvmfPkg/Include/IndustryStandard/LinuxBzimage.h > index d16b112..29362de 100644 > --- a/OvmfPkg/Include/IndustryStandard/LinuxBzimage.h > +++ b/OvmfPkg/Include/IndustryStandard/LinuxBzimage.h > @@ -55,7 +55,8 @@ struct setup_header { > UINT32 ramdisk_max; /* Highest legal initrd address */ > UINT32 kernel_alignment; /* Physical addr alignment required for > kernel */ > UINT8 relocatable_kernel; /* Whether kernel is relocatable or not */ > - UINT8 _pad2[3]; > + UINT8 min_alignment; > + UINT16 xloadflags; > UINT32 cmdline_size; > UINT32 hardware_subarch; > UINT64 hardware_subarch_data;
Should SETUP_VERSION in this file be bumped to 0x20c based on: http://git.kernel.org/linus/09c205af If so, I'll add that too. -Jordan ------------------------------------------------------------------------------ Free Next-Gen Firewall Hardware Offer Buy your Sophos next-gen firewall before the end March 2013 and get the hardware for free! Learn more. http://p.sf.net/sfu/sophos-d2d-feb _______________________________________________ edk2-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/edk2-devel
