diff options
| author | Matt Fleming <matt.fleming@intel.com> | 2013-07-08 17:03:53 +0100 |
|---|---|---|
| committer | Matt Fleming <matt.fleming@intel.com> | 2013-07-08 17:03:53 +0100 |
| commit | 08d7f825a95e12c81a2ef0a1d9fec5520d44df35 (patch) | |
| tree | 9e1709518844c44c86ce0c250993d89654657b5a /com32/include/syslinux | |
| parent | 3aa295d25bda39afee12b015523f222ce7940079 (diff) | |
| parent | 3dafb1427c5ba7d6f061a864ab0d72a95566cfa6 (diff) | |
| download | syslinux-08d7f825a95e12c81a2ef0a1d9fec5520d44df35.tar.gz | |
Merge branch 'kernel-loader' into for-hpa/elflink/firmware
Conflicts:
efi/efi.h
Diffstat (limited to 'com32/include/syslinux')
| -rw-r--r-- | com32/include/syslinux/linux.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/com32/include/syslinux/linux.h b/com32/include/syslinux/linux.h index a8c6f2f5..700ac9a8 100644 --- a/com32/include/syslinux/linux.h +++ b/com32/include/syslinux/linux.h @@ -69,6 +69,11 @@ struct setup_data { #define SETUP_E820_EXT 1 #define SETUP_DTB 2 +#define XLF_KERNEL_64 (1 << 0) +#define XLF_CAN_BE_LOADED_ABOVE_4G (1 << 1) +#define XLF_EFI_HANDOVER_32 (1 << 2) +#define XLF_EFI_HANDOVER_64 (1 << 3) + struct linux_header { uint8_t boot_sector_1[0x0020]; uint16_t old_cmd_line_magic; @@ -100,7 +105,8 @@ struct linux_header { uint32_t initrd_addr_max; uint32_t kernel_alignment; uint8_t relocatable_kernel; - uint8_t pad2[3]; + uint8_t min_alignment; + uint16_t xloadflags; uint32_t cmdline_max_len; uint32_t hardware_subarch; uint64_t hardware_subarch_data; @@ -109,6 +115,7 @@ struct linux_header { uint64_t setup_data; uint64_t pref_address; uint32_t init_size; + uint32_t handover_offset; } __packed; struct screen_info { |