diff options
| author | jljusten <jljusten@6f19259b-4bc3-4df7-8a09-765794883524> | 2013-02-14 19:21:12 +0000 |
|---|---|---|
| committer | jljusten <jljusten@6f19259b-4bc3-4df7-8a09-765794883524> | 2013-02-14 19:21:12 +0000 |
| commit | 25ca06f9a0b64011f93682d3e46511f57c61b7b8 (patch) | |
| tree | 74aefeb1fa8c35a687078eec70d8d7ebf0bcee9b /OvmfPkg | |
| parent | 3d80db51f4ecc5d097ef4254b1b4cf4d73a23fb4 (diff) | |
| download | edk2-25ca06f9a0b64011f93682d3e46511f57c61b7b8.tar.gz edk2-25ca06f9a0b64011f93682d3e46511f57c61b7b8.tar.bz2 edk2-25ca06f9a0b64011f93682d3e46511f57c61b7b8.zip | |
OvmfPkg LinuxBzimage.h: Update for kernel boot protocol 2.12
This was made available in:
http://git.kernel.org/linus/09c205af
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@14131 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'OvmfPkg')
| -rw-r--r-- | OvmfPkg/Include/IndustryStandard/LinuxBzimage.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OvmfPkg/Include/IndustryStandard/LinuxBzimage.h b/OvmfPkg/Include/IndustryStandard/LinuxBzimage.h index d16b112fa1..b83b7916a0 100644 --- a/OvmfPkg/Include/IndustryStandard/LinuxBzimage.h +++ b/OvmfPkg/Include/IndustryStandard/LinuxBzimage.h @@ -1,6 +1,6 @@ /** @file
- Copyright (c) 2011 - 2012, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2011 - 2013, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
which accompanies this distribution. The full text of the license may be found at
@@ -15,7 +15,6 @@ #define __LINUX_BZIMAGE_H__
#define BOOTSIG 0x1FE
-#define SETUP_VERSION 0x206
#define SETUP_HDR 0x53726448 /* 0x53726448 == "HdrS" */
#define E820_RAM 1
@@ -55,7 +54,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;
|